diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-07-05 08:30:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-05 08:30:58 +0200 |
| commit | 08f8ba07998ab1b9efcdd3f28dadf6866a605ddb (patch) | |
| tree | 8e09855446f7b0312bb729d4b539090756e57927 /arch/arm/include | |
| parent | perf: Fix hist_entry__tui_annotate() build failure (diff) | |
| parent | Linux 2.6.35-rc4 (diff) | |
| download | linux-dev-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.tar.xz linux-dev-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.zip | |
Merge commit 'v2.6.35-rc4' into perf/core
Merge reason: Pick up the latest perf fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/mach/udc_pxa2xx.h | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/processor.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach/udc_pxa2xx.h b/arch/arm/include/asm/mach/udc_pxa2xx.h index f3eabf1ecec3..833306ee9e7f 100644 --- a/arch/arm/include/asm/mach/udc_pxa2xx.h +++ b/arch/arm/include/asm/mach/udc_pxa2xx.h @@ -21,8 +21,8 @@ struct pxa2xx_udc_mach_info { * here. Note that sometimes the signals go through inverters... */ bool gpio_vbus_inverted; - u16 gpio_vbus; /* high == vbus present */ + int gpio_vbus; /* high == vbus present */ bool gpio_pullup_inverted; - u16 gpio_pullup; /* high == pullup activated */ + int gpio_pullup; /* high == pullup activated */ }; diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 6a89567ffc5b..7bed3daf83b8 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h @@ -91,7 +91,11 @@ extern void release_thread(struct task_struct *); unsigned long get_wchan(struct task_struct *p); +#if __LINUX_ARM_ARCH__ == 6 +#define cpu_relax() smp_mb() +#else #define cpu_relax() barrier() +#endif /* * Create a new kernel thread |