aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
commit9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch)
tree15c4222de2a2b2814c9430dcb4e997b18597881c /arch
parent7c2db36e730ee4facd341679ecb21ee73ba92831 (diff)
parentdf63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Assorted tiny fixes queued in trivial tree" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits) DocBook: update EXPORT_SYMBOL entry to point at export.h Documentation: update top level 00-INDEX file with new additions ARM: at91/ide: remove unsused at91-ide Kconfig entry percpu_counter.h: comment code for better readability x86, efi: fix comment typo in head_32.S IB: cxgb3: delay freeing mem untill entirely done with it net: mvneta: remove unneeded version.h include time: x86: report_lost_ticks doesn't exist any more pcmcia: avoid static analysis complaint about use-after-free fs/jfs: Fix typo in comment : 'how may' -> 'how many' of: add missing documentation for of_platform_populate() btrfs: remove unnecessary cur_trans set before goto loop in join_transaction sound: soc: Fix typo in sound/codecs treewide: Fix typo in various drivers btrfs: fix comment typos Update ibmvscsi module name in Kconfig. powerpc: fix typo (utilties -> utilities) of: fix spelling mistake in comment h8300: Fix home page URL in h8300/README xtensa: Fix home page URL in Kconfig ...
Diffstat (limited to 'arch')
-rw-r--r--arch/h8300/README2
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-helper-util.c4
-rw-r--r--arch/mips/include/asm/octeon/cvmx-helper-util.h4
-rw-r--r--arch/powerpc/platforms/85xx/p1022_ds.c8
-rw-r--r--arch/powerpc/platforms/86xx/mpc8610_hpcd.c4
-rw-r--r--arch/x86/kernel/cpu/perf_event_amd_ibs.c2
-rw-r--r--arch/xtensa/Kconfig2
7 files changed, 13 insertions, 13 deletions
diff --git a/arch/h8300/README b/arch/h8300/README
index 637f5a02f311..efa805fda19b 100644
--- a/arch/h8300/README
+++ b/arch/h8300/README
@@ -11,7 +11,7 @@ H8/300H and H8S
112.AE 3068/AE 3069 112.AE 3068/AE 3069
12 more information 12 more information
13 MICROTRONIQUE <http://www.microtronique.com/> 13 MICROTRONIQUE <http://www.microtronique.com/>
14 Akizuki Denshi Tsusho Ltd. <http://www.akizuki.ne.jp> (Japanese Only) 14 Akizuki Denshi Tsusho Ltd. <http://akizukidenshi.com/> (Japanese Only)
15 15
163.H8MAX 163.H8MAX
17 see http://ip-sol.jp/h8max/ (Japanese Only) 17 see http://ip-sol.jp/h8max/ (Japanese Only)
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
index 116dea17acf5..dfdfe8bdc9c5 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
@@ -175,7 +175,7 @@ int cvmx_helper_dump_packet(cvmx_wqe_t *work)
175 * Packets will begin slowly dropping when there are less than 175 * Packets will begin slowly dropping when there are less than
176 * this many packet buffers free in FPA 0. 176 * this many packet buffers free in FPA 0.
177 * @drop_thresh: 177 * @drop_thresh:
178 * All incomming packets will be dropped when there are less 178 * All incoming packets will be dropped when there are less
179 * than this many free packet buffers in FPA 0. 179 * than this many free packet buffers in FPA 0.
180 * Returns Zero on success. Negative on failure 180 * Returns Zero on success. Negative on failure
181 */ 181 */
@@ -210,7 +210,7 @@ int cvmx_helper_setup_red_queue(int queue, int pass_thresh, int drop_thresh)
210 * Packets will begin slowly dropping when there are less than 210 * Packets will begin slowly dropping when there are less than
211 * this many packet buffers free in FPA 0. 211 * this many packet buffers free in FPA 0.
212 * @drop_thresh: 212 * @drop_thresh:
213 * All incomming packets will be dropped when there are less 213 * All incoming packets will be dropped when there are less
214 * than this many free packet buffers in FPA 0. 214 * than this many free packet buffers in FPA 0.
215 * Returns Zero on success. Negative on failure 215 * Returns Zero on success. Negative on failure
216 */ 216 */
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-util.h b/arch/mips/include/asm/octeon/cvmx-helper-util.h
index 6a6e52fc22c1..01c8ddd84ff8 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-util.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h
@@ -60,7 +60,7 @@ extern int cvmx_helper_dump_packet(cvmx_wqe_t *work);
60 * Packets will begin slowly dropping when there are less than 60 * Packets will begin slowly dropping when there are less than
61 * this many packet buffers free in FPA 0. 61 * this many packet buffers free in FPA 0.
62 * @drop_thresh: 62 * @drop_thresh:
63 * All incomming packets will be dropped when there are less 63 * All incoming packets will be dropped when there are less
64 * than this many free packet buffers in FPA 0. 64 * than this many free packet buffers in FPA 0.
65 * Returns Zero on success. Negative on failure 65 * Returns Zero on success. Negative on failure
66 */ 66 */
@@ -74,7 +74,7 @@ extern int cvmx_helper_setup_red_queue(int queue, int pass_thresh,
74 * Packets will begin slowly dropping when there are less than 74 * Packets will begin slowly dropping when there are less than
75 * this many packet buffers free in FPA 0. 75 * this many packet buffers free in FPA 0.
76 * @drop_thresh: 76 * @drop_thresh:
77 * All incomming packets will be dropped when there are less 77 * All incoming packets will be dropped when there are less
78 * than this many free packet buffers in FPA 0. 78 * than this many free packet buffers in FPA 0.
79 * Returns Zero on success. Negative on failure 79 * Returns Zero on success. Negative on failure
80 */ 80 */
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 7328b8d74129..e346edf7f157 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -215,13 +215,13 @@ static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port)
215 /* Map the global utilities registers. */ 215 /* Map the global utilities registers. */
216 guts_node = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts"); 216 guts_node = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts");
217 if (!guts_node) { 217 if (!guts_node) {
218 pr_err("p1022ds: missing global utilties device node\n"); 218 pr_err("p1022ds: missing global utilities device node\n");
219 return; 219 return;
220 } 220 }
221 221
222 guts = of_iomap(guts_node, 0); 222 guts = of_iomap(guts_node, 0);
223 if (!guts) { 223 if (!guts) {
224 pr_err("p1022ds: could not map global utilties device\n"); 224 pr_err("p1022ds: could not map global utilities device\n");
225 goto exit; 225 goto exit;
226 } 226 }
227 227
@@ -416,14 +416,14 @@ void p1022ds_set_pixel_clock(unsigned int pixclock)
416 /* Map the global utilities registers. */ 416 /* Map the global utilities registers. */
417 guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts"); 417 guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts");
418 if (!guts_np) { 418 if (!guts_np) {
419 pr_err("p1022ds: missing global utilties device node\n"); 419 pr_err("p1022ds: missing global utilities device node\n");
420 return; 420 return;
421 } 421 }
422 422
423 guts = of_iomap(guts_np, 0); 423 guts = of_iomap(guts_np, 0);
424 of_node_put(guts_np); 424 of_node_put(guts_np);
425 if (!guts) { 425 if (!guts) {
426 pr_err("p1022ds: could not map global utilties device\n"); 426 pr_err("p1022ds: could not map global utilities device\n");
427 return; 427 return;
428 } 428 }
429 429
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 04d9d317f741..d479d68fbb2b 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -236,14 +236,14 @@ void mpc8610hpcd_set_pixel_clock(unsigned int pixclock)
236 /* Map the global utilities registers. */ 236 /* Map the global utilities registers. */
237 guts_np = of_find_compatible_node(NULL, NULL, "fsl,mpc8610-guts"); 237 guts_np = of_find_compatible_node(NULL, NULL, "fsl,mpc8610-guts");
238 if (!guts_np) { 238 if (!guts_np) {
239 pr_err("mpc8610hpcd: missing global utilties device node\n"); 239 pr_err("mpc8610hpcd: missing global utilities device node\n");
240 return; 240 return;
241 } 241 }
242 242
243 guts = of_iomap(guts_np, 0); 243 guts = of_iomap(guts_np, 0);
244 of_node_put(guts_np); 244 of_node_put(guts_np);
245 if (!guts) { 245 if (!guts) {
246 pr_err("mpc8610hpcd: could not map global utilties device\n"); 246 pr_err("mpc8610hpcd: could not map global utilities device\n");
247 return; 247 return;
248 } 248 }
249 249
diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/kernel/cpu/perf_event_amd_ibs.c
index 6336bcbd0618..5f0581e713c2 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c
+++ b/arch/x86/kernel/cpu/perf_event_amd_ibs.c
@@ -528,7 +528,7 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)
528 if (!test_bit(IBS_STARTED, pcpu->state)) { 528 if (!test_bit(IBS_STARTED, pcpu->state)) {
529 /* 529 /*
530 * Catch spurious interrupts after stopping IBS: After 530 * Catch spurious interrupts after stopping IBS: After
531 * disabling IBS there could be still incomming NMIs 531 * disabling IBS there could be still incoming NMIs
532 * with samples that even have the valid bit cleared. 532 * with samples that even have the valid bit cleared.
533 * Mark all this NMIs as handled. 533 * Mark all this NMIs as handled.
534 */ 534 */
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index ad64c73b8675..cb557be492b1 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -22,7 +22,7 @@ config XTENSA
22 configurable and extensible. The Linux port to the Xtensa 22 configurable and extensible. The Linux port to the Xtensa
23 architecture supports all processor configurations and extensions, 23 architecture supports all processor configurations and extensions,
24 with reasonable minimum requirements. The Xtensa Linux project has 24 with reasonable minimum requirements. The Xtensa Linux project has
25 a home page at <http://xtensa.sourceforge.net/>. 25 a home page at <http://www.linux-xtensa.org/>.
26 26
27config RWSEM_XCHGADD_ALGORITHM 27config RWSEM_XCHGADD_ALGORITHM
28 def_bool y 28 def_bool y