diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /arch/xtensa/kernel | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'arch/xtensa/kernel')
| -rw-r--r-- | arch/xtensa/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S index 80d24c485fd3..77fc9f6dc016 100644 --- a/arch/xtensa/kernel/entry.S +++ b/arch/xtensa/kernel/entry.S | |||
| @@ -104,7 +104,7 @@ | |||
| 104 | * excsave has been restored, and | 104 | * excsave has been restored, and |
| 105 | * stack pointer (a1) has been set. | 105 | * stack pointer (a1) has been set. |
| 106 | * | 106 | * |
| 107 | * Note: _user_exception might be at an odd adress. Don't use call0..call12 | 107 | * Note: _user_exception might be at an odd address. Don't use call0..call12 |
| 108 | */ | 108 | */ |
| 109 | 109 | ||
| 110 | ENTRY(user_exception) | 110 | ENTRY(user_exception) |
| @@ -244,7 +244,7 @@ _user_exception: | |||
| 244 | * excsave has been restored, and | 244 | * excsave has been restored, and |
| 245 | * stack pointer (a1) has been set. | 245 | * stack pointer (a1) has been set. |
| 246 | * | 246 | * |
| 247 | * Note: _kernel_exception might be at an odd adress. Don't use call0..call12 | 247 | * Note: _kernel_exception might be at an odd address. Don't use call0..call12 |
| 248 | */ | 248 | */ |
| 249 | 249 | ||
| 250 | ENTRY(kernel_exception) | 250 | ENTRY(kernel_exception) |