diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:48:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 10:48:16 -0700 |
| commit | 51e8703bdf12e2481b205096c973a3ab6a8ca18b (patch) | |
| tree | ed6b4131b8a613e9492488fb2b31d16bc9991ce1 /arch/microblaze/kernel/exceptions.c | |
| parent | 1fd06bb1571e2618ae392e2484925bf0dadd7857 (diff) | |
| parent | 0b9b0200b0922c29dc251b99700f96dade92214a (diff) | |
| download | talos-op-linux-51e8703bdf12e2481b205096c973a3ab6a8ca18b.tar.gz talos-op-linux-51e8703bdf12e2481b205096c973a3ab6a8ca18b.zip | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze: (33 commits)
microblaze: Do not copy reset vectors/manual reset vector setup
microblaze: Fix _reset function
microblaze: Fix microblaze init vectors
microblaze: Fix circular headers dependency when ftrace is enabled.
microblaze: Fix typo in Kconfig
microblaze: Add missing export symbols for lib functions
microblaze: Fix /dev/zero corruption from __clear_user()
microblaze: Convert irq_chip to new functions
microblaze: Select GENERIC_HARDIRQS_NO_DEPRECATED
microblaze: Remove stale irq_chip.end
microblaze: Fix sparse warnings - signal.c
microblaze: Fix sparse warning - fault.c
microblaze: Fix missing microblaze specific syscalls declaration
microblaze: Fix sparse warnings - cache.c
microblaze: Fix sparse warning - cpuinfo.h
microblaze: Fix sparse warning - unwind.c
microblaze: Fix sparse warning - consistent_alloc function
microblaze: Fix sparse warnings - ptrace
microblaze: Fix sparse warning - sw_exceptions
microblaze: Fix sparse warning - timer.c
...
Diffstat (limited to 'arch/microblaze/kernel/exceptions.c')
| -rw-r--r-- | arch/microblaze/kernel/exceptions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/exceptions.c b/arch/microblaze/kernel/exceptions.c index a7fa6ae76d89..66fad2301221 100644 --- a/arch/microblaze/kernel/exceptions.c +++ b/arch/microblaze/kernel/exceptions.c @@ -50,7 +50,7 @@ void die(const char *str, struct pt_regs *fp, long err) } /* for user application debugging */ -void sw_exception(struct pt_regs *regs) +asmlinkage void sw_exception(struct pt_regs *regs) { _exception(SIGTRAP, regs, TRAP_BRKPT, regs->r16); flush_dcache_range(regs->r16, regs->r16 + 0x4); |
