diff options
| author | Robin Getz <rgetz@blackfin.uclinux.org> | 2009-01-07 15:14:39 (GMT) |
|---|---|---|
| committer | Bryan Wu <cooloney@kernel.org> | 2009-01-07 15:14:39 (GMT) |
| commit | 26fe19f76027b05c39faa9b728912631e91ec182 (patch) | |
| tree | b66ea7b4f8d56dac40aa8af919d64f71c8c0a18c /arch/blackfin | |
| parent | 2377feb4ce1cd42b7c1d266f466d69597d9dac7f (diff) | |
| download | linux-fsl-qoriq-26fe19f76027b05c39faa9b728912631e91ec182.tar.xz | |
Blackfin arch: Update some inline assembly, tweak some register constraints
Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/include/asm/bfrom.h | 5 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/system.h | 8 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/thread_info.h | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/arch/blackfin/include/asm/bfrom.h b/arch/blackfin/include/asm/bfrom.h index cfe8024..9e4be5e 100644 --- a/arch/blackfin/include/asm/bfrom.h +++ b/arch/blackfin/include/asm/bfrom.h @@ -43,6 +43,11 @@ __attribute__((__noreturn__)) static inline void bfrom_SoftReset(void *new_stack) { while (1) + /* + * We don't declare the SP as clobbered on purpose, since + * it confuses the heck out of the compiler, and this function + * never returns + */ __asm__ __volatile__( "sp = %[stack];" "jump (%[bfrom_syscontrol]);" diff --git a/arch/blackfin/include/asm/system.h b/arch/blackfin/include/asm/system.h index dea9203..aa7d87b 100644 --- a/arch/blackfin/include/asm/system.h +++ b/arch/blackfin/include/asm/system.h @@ -44,10 +44,10 @@ /* * Force strict CPU ordering. */ -#define nop() asm volatile ("nop;\n\t"::) -#define mb() asm volatile ("" : : :"memory") -#define rmb() asm volatile ("" : : :"memory") -#define wmb() asm volatile ("" : : :"memory") +#define nop() __asm__ __volatile__ ("nop;\n\t" : : ) +#define mb() __asm__ __volatile__ ("" : : : "memory") +#define rmb() __asm__ __volatile__ ("" : : : "memory") +#define wmb() __asm__ __volatile__ ("" : : : "memory") #define set_mb(var, value) do { (void) xchg(&var, value); } while (0) #define read_barrier_depends() do { } while(0) diff --git a/arch/blackfin/include/asm/thread_info.h b/arch/blackfin/include/asm/thread_info.h index 1d380de..7eaf2e2 100644 --- a/arch/blackfin/include/asm/thread_info.h +++ b/arch/blackfin/include/asm/thread_info.h @@ -91,7 +91,7 @@ __attribute_const__ static inline struct thread_info *current_thread_info(void) { struct thread_info *ti; - __asm__("%0 = sp;": "=&d"(ti): + __asm__("%0 = sp;" : "=da"(ti) : ); return (struct thread_info *)((long)ti & ~((long)THREAD_SIZE-1)); } |