diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 14:28:55 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 14:28:55 +0900 |
| commit | 11db81a59d0b2e563e30512cd76f23d0db384780 (patch) | |
| tree | 35a84e91c71cf0fcbffa3c5c8af36547a203a867 /arch/microblaze/kernel/hw_exception_handler.S | |
| parent | 0993537bff42edfbea7649975196cd2552c4b936 (diff) | |
| parent | 63d7bd1b171d5e7190c50dd3e48b1c561d7803d8 (diff) | |
Merge tag 'microblaze-3.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
- Get rid of NO_MMU Kconfig
- mmap2 fixups
- Some minor cleanups
* tag 'microblaze-3.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Remove incorrect file path
microblaze: Fix bug with mmap2 syscall MB implementation
microblaze: Use predefined SYSCALL_DEFINE macro
microblaze: Remove deprecated IRQF_DISABLED
microblaze: Calculate kernel pad automatically
microblaze: Remove unused NO_MMU Kconfig parameter
Diffstat (limited to 'arch/microblaze/kernel/hw_exception_handler.S')
| -rw-r--r-- | arch/microblaze/kernel/hw_exception_handler.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/hw_exception_handler.S b/arch/microblaze/kernel/hw_exception_handler.S index 61b3a1fed46f..fc6b89f4dd31 100644 --- a/arch/microblaze/kernel/hw_exception_handler.S +++ b/arch/microblaze/kernel/hw_exception_handler.S @@ -193,8 +193,8 @@ * - W S REG EXC * * - * STACK FRAME STRUCTURE (for NO_MMU) - * --------------------------------- + * STACK FRAME STRUCTURE (for CONFIG_MMU=n) + * ---------------------------------------- * * +-------------+ + 0 * | MSR | |