diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /arch/parisc/kernel | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r-- | arch/parisc/kernel/cache.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/hardware.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/signal.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index 395bbce64993..e10d25d2d9c9 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c | |||
@@ -305,7 +305,7 @@ flush_user_cache_page_non_current(struct vm_area_struct *vma, | |||
305 | /* save the current process space and pgd */ | 305 | /* save the current process space and pgd */ |
306 | unsigned long space = mfsp(3), pgd = mfctl(25); | 306 | unsigned long space = mfsp(3), pgd = mfctl(25); |
307 | 307 | ||
308 | /* we don't mind taking interrups since they may not | 308 | /* we don't mind taking interrupts since they may not |
309 | * do anything with user space, but we can't | 309 | * do anything with user space, but we can't |
310 | * be preempted here */ | 310 | * be preempted here */ |
311 | preempt_disable(); | 311 | preempt_disable(); |
diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c index 04848b2b381c..84b9611a9228 100644 --- a/arch/parisc/kernel/hardware.c +++ b/arch/parisc/kernel/hardware.c | |||
@@ -1187,7 +1187,7 @@ static struct hp_hardware hp_hardware_list[] __devinitdata = { | |||
1187 | {HPHW_FIO, 0x005, 0x000A9, 0x00, "AllegroLow Core PCI USB KB"}, | 1187 | {HPHW_FIO, 0x005, 0x000A9, 0x00, "AllegroLow Core PCI USB KB"}, |
1188 | {HPHW_FIO, 0x006, 0x000A9, 0x00, "AllegroHigh Core PCI SuperIO RS-232"}, | 1188 | {HPHW_FIO, 0x006, 0x000A9, 0x00, "AllegroHigh Core PCI SuperIO RS-232"}, |
1189 | {HPHW_FIO, 0x006, 0x000A9, 0x00, "AllegroHigh Core PCI USB KB"}, | 1189 | {HPHW_FIO, 0x006, 0x000A9, 0x00, "AllegroHigh Core PCI USB KB"}, |
1190 | {HPHW_FIO, 0x007, 0x000A9, 0x0, "Miscelaneous PCI Plug-in"}, | 1190 | {HPHW_FIO, 0x007, 0x000A9, 0x0, "Miscellaneous PCI Plug-in"}, |
1191 | {HPHW_FIO, 0x00A, 0x000A9, 0x0, "Lego 360 Core PCI SuperIO RS-232"}, | 1191 | {HPHW_FIO, 0x00A, 0x000A9, 0x0, "Lego 360 Core PCI SuperIO RS-232"}, |
1192 | {HPHW_FIO, 0x00A, 0x000A9, 0x0, "Lego 360 Core PCI USB KB"}, | 1192 | {HPHW_FIO, 0x00A, 0x000A9, 0x0, "Lego 360 Core PCI USB KB"}, |
1193 | {HPHW_FIO, 0x004, 0x00320, 0x0, "Metheus Frame Buffer"}, | 1193 | {HPHW_FIO, 0x004, 0x00320, 0x0, "Metheus Frame Buffer"}, |
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c index 2ce3806f02e1..58fccc96d003 100644 --- a/arch/parisc/kernel/signal.c +++ b/arch/parisc/kernel/signal.c | |||
@@ -333,7 +333,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
333 | flush_user_icache_range((unsigned long) &frame->tramp[0], | 333 | flush_user_icache_range((unsigned long) &frame->tramp[0], |
334 | (unsigned long) &frame->tramp[TRAMP_SIZE]); | 334 | (unsigned long) &frame->tramp[TRAMP_SIZE]); |
335 | 335 | ||
336 | /* TRAMP Words 0-4, Lenght 5 = SIGRESTARTBLOCK_TRAMP | 336 | /* TRAMP Words 0-4, Length 5 = SIGRESTARTBLOCK_TRAMP |
337 | * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP | 337 | * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP |
338 | * So the SIGRETURN_TRAMP is at the end of SIGRESTARTBLOCK_TRAMP | 338 | * So the SIGRETURN_TRAMP is at the end of SIGRESTARTBLOCK_TRAMP |
339 | */ | 339 | */ |