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/mips | |
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/mips')
-rw-r--r-- | arch/mips/Kconfig | 4 | ||||
-rw-r--r-- | arch/mips/au1000/mtx-1/board_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/binfmt_elfn32.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/binfmt_elfo32.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/kspd.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/setup.c | 4 | ||||
-rw-r--r-- | arch/mips/kernel/smtc.c | 6 | ||||
-rw-r--r-- | arch/mips/mm/c-r4k.c | 2 | ||||
-rw-r--r-- | arch/mips/sgi-ip27/ip27-hubio.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d38ebd3b1201..ec78a5762e9e 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1755,8 +1755,8 @@ config SMP | |||
1755 | People using multiprocessor machines who say Y here should also say | 1755 | People using multiprocessor machines who say Y here should also say |
1756 | Y to "Enhanced Real Time Clock Support", below. | 1756 | Y to "Enhanced Real Time Clock Support", below. |
1757 | 1757 | ||
1758 | See also the <file:Documentation/smp.txt> and the SMP-HOWTO | 1758 | See also the SMP-HOWTO available at |
1759 | available at <http://www.tldp.org/docs.html#howto>. | 1759 | <http://www.tldp.org/docs.html#howto>. |
1760 | 1760 | ||
1761 | If you don't know what to do here, say N. | 1761 | If you don't know what to do here, say N. |
1762 | 1762 | ||
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c index abfc4bcddf7a..310d5dff89fc 100644 --- a/arch/mips/au1000/mtx-1/board_setup.c +++ b/arch/mips/au1000/mtx-1/board_setup.c | |||
@@ -99,7 +99,7 @@ mtx1_pci_idsel(unsigned int devsel, int assert) | |||
99 | #endif | 99 | #endif |
100 | 100 | ||
101 | if (assert && devsel != 0) { | 101 | if (assert && devsel != 0) { |
102 | // supress signal to cardbus | 102 | // suppress signal to cardbus |
103 | au_writel( 0x00000002, SYS_OUTPUTCLR ); // set EXT_IO3 OFF | 103 | au_writel( 0x00000002, SYS_OUTPUTCLR ); // set EXT_IO3 OFF |
104 | } | 104 | } |
105 | else { | 105 | else { |
diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c index 9b34238d41c0..77db3473deab 100644 --- a/arch/mips/kernel/binfmt_elfn32.c +++ b/arch/mips/kernel/binfmt_elfn32.c | |||
@@ -98,7 +98,7 @@ static __inline__ void | |||
98 | jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) | 98 | jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) |
99 | { | 99 | { |
100 | /* | 100 | /* |
101 | * Convert jiffies to nanoseconds and seperate with | 101 | * Convert jiffies to nanoseconds and separate with |
102 | * one divide. | 102 | * one divide. |
103 | */ | 103 | */ |
104 | u64 nsec = (u64)jiffies * TICK_NSEC; | 104 | u64 nsec = (u64)jiffies * TICK_NSEC; |
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c index da41eac195ca..08f4cd781ee3 100644 --- a/arch/mips/kernel/binfmt_elfo32.c +++ b/arch/mips/kernel/binfmt_elfo32.c | |||
@@ -100,7 +100,7 @@ static inline void | |||
100 | jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) | 100 | jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) |
101 | { | 101 | { |
102 | /* | 102 | /* |
103 | * Convert jiffies to nanoseconds and seperate with | 103 | * Convert jiffies to nanoseconds and separate with |
104 | * one divide. | 104 | * one divide. |
105 | */ | 105 | */ |
106 | u64 nsec = (u64)jiffies * TICK_NSEC; | 106 | u64 nsec = (u64)jiffies * TICK_NSEC; |
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c index f6704ab16306..998c4efcce88 100644 --- a/arch/mips/kernel/kspd.c +++ b/arch/mips/kernel/kspd.c | |||
@@ -221,7 +221,7 @@ void sp_work_handle_request(void) | |||
221 | } | 221 | } |
222 | } | 222 | } |
223 | 223 | ||
224 | /* Run the syscall at the priviledge of the user who loaded the | 224 | /* Run the syscall at the privilege of the user who loaded the |
225 | SP program */ | 225 | SP program */ |
226 | 226 | ||
227 | if (vpe_getuid(tclimit)) | 227 | if (vpe_getuid(tclimit)) |
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 269c252d956f..c032409cba9b 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
@@ -424,13 +424,13 @@ static void __init bootmem_init(void) | |||
424 | #endif /* CONFIG_SGI_IP27 */ | 424 | #endif /* CONFIG_SGI_IP27 */ |
425 | 425 | ||
426 | /* | 426 | /* |
427 | * arch_mem_init - initialize memory managment subsystem | 427 | * arch_mem_init - initialize memory management subsystem |
428 | * | 428 | * |
429 | * o plat_mem_setup() detects the memory configuration and will record detected | 429 | * o plat_mem_setup() detects the memory configuration and will record detected |
430 | * memory areas using add_memory_region. | 430 | * memory areas using add_memory_region. |
431 | * | 431 | * |
432 | * At this stage the memory configuration of the system is known to the | 432 | * At this stage the memory configuration of the system is known to the |
433 | * kernel but generic memory managment system is still entirely uninitialized. | 433 | * kernel but generic memory management system is still entirely uninitialized. |
434 | * | 434 | * |
435 | * o bootmem_init() | 435 | * o bootmem_init() |
436 | * o sparse_init() | 436 | * o sparse_init() |
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 85f700e58131..b42e71c71119 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
@@ -65,7 +65,7 @@ asiduse smtc_live_asid[MAX_SMTC_TLBS][MAX_SMTC_ASIDS]; | |||
65 | static atomic_t ipi_timer_latch[NR_CPUS]; | 65 | static atomic_t ipi_timer_latch[NR_CPUS]; |
66 | 66 | ||
67 | /* | 67 | /* |
68 | * Number of InterProcessor Interupt (IPI) message buffers to allocate | 68 | * Number of InterProcessor Interrupt (IPI) message buffers to allocate |
69 | */ | 69 | */ |
70 | 70 | ||
71 | #define IPIBUF_PER_CPU 4 | 71 | #define IPIBUF_PER_CPU 4 |
@@ -780,7 +780,7 @@ void smtc_send_ipi(int cpu, int type, unsigned int action) | |||
780 | if (cpu_data[cpu].vpe_id != cpu_data[smp_processor_id()].vpe_id) { | 780 | if (cpu_data[cpu].vpe_id != cpu_data[smp_processor_id()].vpe_id) { |
781 | if (type == SMTC_CLOCK_TICK) | 781 | if (type == SMTC_CLOCK_TICK) |
782 | atomic_inc(&ipi_timer_latch[cpu]); | 782 | atomic_inc(&ipi_timer_latch[cpu]); |
783 | /* If not on same VPE, enqueue and send cross-VPE interupt */ | 783 | /* If not on same VPE, enqueue and send cross-VPE interrupt */ |
784 | smtc_ipi_nq(&IPIQ[cpu], pipi); | 784 | smtc_ipi_nq(&IPIQ[cpu], pipi); |
785 | LOCK_CORE_PRA(); | 785 | LOCK_CORE_PRA(); |
786 | settc(cpu_data[cpu].tc_id); | 786 | settc(cpu_data[cpu].tc_id); |
@@ -1063,7 +1063,7 @@ static void setup_cross_vpe_interrupts(unsigned int nvpe) | |||
1063 | return; | 1063 | return; |
1064 | 1064 | ||
1065 | if (!cpu_has_vint) | 1065 | if (!cpu_has_vint) |
1066 | panic("SMTC Kernel requires Vectored Interupt support"); | 1066 | panic("SMTC Kernel requires Vectored Interrupt support"); |
1067 | 1067 | ||
1068 | set_vi_handler(MIPS_CPU_IPI_IRQ, ipi_irq_dispatch); | 1068 | set_vi_handler(MIPS_CPU_IPI_IRQ, ipi_irq_dispatch); |
1069 | 1069 | ||
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 02bd180f0e02..53ec05267a98 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -1101,7 +1101,7 @@ static void __init setup_scache(void) | |||
1101 | /* | 1101 | /* |
1102 | * Do the probing thing on R4000SC and R4400SC processors. Other | 1102 | * Do the probing thing on R4000SC and R4400SC processors. Other |
1103 | * processors don't have a S-cache that would be relevant to the | 1103 | * processors don't have a S-cache that would be relevant to the |
1104 | * Linux memory managment. | 1104 | * Linux memory management. |
1105 | */ | 1105 | */ |
1106 | switch (c->cputype) { | 1106 | switch (c->cputype) { |
1107 | case CPU_R4000SC: | 1107 | case CPU_R4000SC: |
diff --git a/arch/mips/sgi-ip27/ip27-hubio.c b/arch/mips/sgi-ip27/ip27-hubio.c index 524b371f9397..a1fa4abb3f6a 100644 --- a/arch/mips/sgi-ip27/ip27-hubio.c +++ b/arch/mips/sgi-ip27/ip27-hubio.c | |||
@@ -168,7 +168,7 @@ static void hub_set_piomode(nasid_t nasid) | |||
168 | } | 168 | } |
169 | 169 | ||
170 | /* | 170 | /* |
171 | * hub_pio_init - PIO-related hub initalization | 171 | * hub_pio_init - PIO-related hub initialization |
172 | * | 172 | * |
173 | * @hub: hubinfo structure for our hub | 173 | * @hub: hubinfo structure for our hub |
174 | */ | 174 | */ |