diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:29:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 16:29:02 -0500 |
| commit | 874ff01bd9183ad16495acfd54e93a619d12b8b5 (patch) | |
| tree | e9527e94649fadfa705dae64018e027e51681b88 /arch/powerpc | |
| parent | ebbe46f73a11a667df59cb8e58b371c0a35f29d0 (diff) | |
| parent | 86aae08faa0069a559ba543ff3dab33fe95f891b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
Documentation/kernel-docs.txt update.
arch/cris: typo in KERN_INFO
Storage class should be before const qualifier
kernel/printk.c: comment fix
update I/O sched Kconfig help texts - CFQ is now default, not AS.
Remove duplicate listing of Cris arch from README
kbuild: more doc. cleanups
doc: make doc. for maxcpus= more visible
drivers/net/eexpress.c: remove duplicate comment
add a help text for BLK_DEV_GENERIC
correct a dead URL in the IP_MULTICAST help text
fix the BAYCOM_SER_HDX help text
fix SCSI_SCAN_ASYNC help text
trivial documentation patch for platform.txt
Fix typos concerning hierarchy
Fix comment typo "spin_lock_irqrestore".
Fix misspellings of "agressive".
drivers/scsi/a100u2w.c: trivial typo patch
Correct trivial typo in log2.h.
Remove useless FIND_FIRST_BIT() macro from cardbus.c.
...
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/rtas.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/mm/numa.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 76b5d7ebdcc6..9d0735a54564 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
| @@ -182,7 +182,7 @@ void rtas_progress(char *s, unsigned short hex) | |||
| 182 | char *os; | 182 | char *os; |
| 183 | static int display_character, set_indicator; | 183 | static int display_character, set_indicator; |
| 184 | static int display_width, display_lines, form_feed; | 184 | static int display_width, display_lines, form_feed; |
| 185 | const static int *row_width; | 185 | static const int *row_width; |
| 186 | static DEFINE_SPINLOCK(progress_lock); | 186 | static DEFINE_SPINLOCK(progress_lock); |
| 187 | static int current_line; | 187 | static int current_line; |
| 188 | static int pending_newline = 0; /* did last write end with unprinted newline? */ | 188 | static int pending_newline = 0; /* did last write end with unprinted newline? */ |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 262790910ff2..e86c37c82cfd 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
| @@ -154,7 +154,7 @@ EXPORT_SYMBOL_GPL(of_node_to_nid); | |||
| 154 | * characteristics relative to its multiple connections. We ignore | 154 | * characteristics relative to its multiple connections. We ignore |
| 155 | * this for now. We also assume that all cpu and memory sets have | 155 | * this for now. We also assume that all cpu and memory sets have |
| 156 | * their distances represented at a common level. This won't be | 156 | * their distances represented at a common level. This won't be |
| 157 | * true for heirarchical NUMA. | 157 | * true for hierarchical NUMA. |
| 158 | * | 158 | * |
| 159 | * In any case the ibm,associativity-reference-points should give | 159 | * In any case the ibm,associativity-reference-points should give |
| 160 | * the correct depth for a normal NUMA system. | 160 | * the correct depth for a normal NUMA system. |