diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
commit | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch) | |
tree | 734289dc85074903d9e636a935d43414746e222c /arch | |
parent | 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff) | |
parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
code cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
mm: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
m32r: Convert print_symbol to %pSR
iostats.txt: add easy-to-find description for field 6
x86 cmpxchg.h: fix wrong comment
treewide: Fix typo in printk and comments
doc: devicetree: Fix various typos
docbook: fix 8250 naming in device-drivers
pata_pdc2027x: Fix compiler warning
treewide: Fix typo in printks
mei: Fix comments in drivers/misc/mei
treewide: Fix typos in kernel messages
pm44xx: Fix comment for "CONFIG_CPU_IDLE"
doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
mmzone: correct "pags" to "pages" in comment.
kernel-parameters: remove outdated 'noresidual' parameter
Remove spurious _H suffixes from ifdef comments
sound: Remove stray pluses from Kconfig file
radio-shark: Fix printk "CONFIG_LED_CLASS"
doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
...
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arc/kernel/disasm.c | 2 | ||||
-rw-r--r-- | arch/arc/plat-arcfpga/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/kernel/topology.c | 2 | ||||
-rw-r--r-- | arch/arm/kvm/arm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/irq-armada-370-xp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm44xx.c | 4 | ||||
-rw-r--r-- | arch/blackfin/include/asm/bfin_sport3.h | 2 | ||||
-rw-r--r-- | arch/m32r/kernel/traps.c | 6 | ||||
-rw-r--r-- | arch/powerpc/kernel/nvram_64.c | 3 | ||||
-rw-r--r-- | arch/powerpc/kvm/book3s_pr.c | 2 | ||||
-rw-r--r-- | arch/s390/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/s390/kvm/trace.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/cmpxchg.h | 2 |
13 files changed, 15 insertions, 18 deletions
diff --git a/arch/arc/kernel/disasm.c b/arch/arc/kernel/disasm.c index 2f390289a792..d14764ae2c60 100644 --- a/arch/arc/kernel/disasm.c +++ b/arch/arc/kernel/disasm.c | |||
@@ -535,4 +535,4 @@ int __kprobes disasm_next_pc(unsigned long pc, struct pt_regs *regs, | |||
535 | return instr.is_branch; | 535 | return instr.is_branch; |
536 | } | 536 | } |
537 | 537 | ||
538 | #endif /* CONFIG_KGDB || CONFIG_MISALIGN_ACCESS || CONFIG_KPROBES */ | 538 | #endif /* CONFIG_KGDB || CONFIG_ARC_MISALIGN_ACCESS || CONFIG_KPROBES */ |
diff --git a/arch/arc/plat-arcfpga/Kconfig b/arch/arc/plat-arcfpga/Kconfig index b41e786cdbc0..295cefeb25d3 100644 --- a/arch/arc/plat-arcfpga/Kconfig +++ b/arch/arc/plat-arcfpga/Kconfig | |||
@@ -53,7 +53,7 @@ menuconfig ARC_HAS_BVCI_LAT_UNIT | |||
53 | bool "BVCI Bus Latency Unit" | 53 | bool "BVCI Bus Latency Unit" |
54 | depends on ARC_BOARD_ML509 || ARC_BOARD_ANGEL4 | 54 | depends on ARC_BOARD_ML509 || ARC_BOARD_ANGEL4 |
55 | help | 55 | help |
56 | IP to add artifical latency to BVCI Bus Based FPGA builds. | 56 | IP to add artificial latency to BVCI Bus Based FPGA builds. |
57 | The default latency (even worst case) for FPGA is non-realistic | 57 | The default latency (even worst case) for FPGA is non-realistic |
58 | (~10 SDRAM, ~5 SSRAM). | 58 | (~10 SDRAM, ~5 SSRAM). |
59 | 59 | ||
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 79282ebcd939..f10316b4ecdc 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c | |||
@@ -100,7 +100,7 @@ static void __init parse_dt_topology(void) | |||
100 | int alloc_size, cpu = 0; | 100 | int alloc_size, cpu = 0; |
101 | 101 | ||
102 | alloc_size = nr_cpu_ids * sizeof(struct cpu_capacity); | 102 | alloc_size = nr_cpu_ids * sizeof(struct cpu_capacity); |
103 | cpu_capacity = (struct cpu_capacity *)kzalloc(alloc_size, GFP_NOWAIT); | 103 | cpu_capacity = kzalloc(alloc_size, GFP_NOWAIT); |
104 | 104 | ||
105 | while ((cn = of_find_node_by_type(cn, "cpu"))) { | 105 | while ((cn = of_find_node_by_type(cn, "cpu"))) { |
106 | const u32 *rate, *reg; | 106 | const u32 *rate, *reg; |
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index c1fe498983ac..842098d78f58 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c | |||
@@ -614,7 +614,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, | |||
614 | 614 | ||
615 | if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) | 615 | if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) |
616 | || !arm_exit_handlers[hsr_ec]) { | 616 | || !arm_exit_handlers[hsr_ec]) { |
617 | kvm_err("Unkown exception class: %#08lx, " | 617 | kvm_err("Unknown exception class: %#08lx, " |
618 | "hsr: %#08x\n", hsr_ec, | 618 | "hsr: %#08x\n", hsr_ec, |
619 | (unsigned int)vcpu->arch.hsr); | 619 | (unsigned int)vcpu->arch.hsr); |
620 | BUG(); | 620 | BUG(); |
diff --git a/arch/arm/mach-mvebu/irq-armada-370-xp.c b/arch/arm/mach-mvebu/irq-armada-370-xp.c index d5970f5a1e8d..830139a3e2ba 100644 --- a/arch/arm/mach-mvebu/irq-armada-370-xp.c +++ b/arch/arm/mach-mvebu/irq-armada-370-xp.c | |||
@@ -57,7 +57,7 @@ static struct irq_domain *armada_370_xp_mpic_domain; | |||
57 | /* | 57 | /* |
58 | * In SMP mode: | 58 | * In SMP mode: |
59 | * For shared global interrupts, mask/unmask global enable bit | 59 | * For shared global interrupts, mask/unmask global enable bit |
60 | * For CPU interrtups, mask/unmask the calling CPU's bit | 60 | * For CPU interrupts, mask/unmask the calling CPU's bit |
61 | */ | 61 | */ |
62 | static void armada_370_xp_irq_mask(struct irq_data *d) | 62 | static void armada_370_xp_irq_mask(struct irq_data *d) |
63 | { | 63 | { |
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index ea62e75ef21d..152a10cf4f1d 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c | |||
@@ -126,8 +126,8 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused) | |||
126 | * omap_default_idle - OMAP4 default ilde routine.' | 126 | * omap_default_idle - OMAP4 default ilde routine.' |
127 | * | 127 | * |
128 | * Implements OMAP4 memory, IO ordering requirements which can't be addressed | 128 | * Implements OMAP4 memory, IO ordering requirements which can't be addressed |
129 | * with default cpu_do_idle() hook. Used by all CPUs with !CONFIG_CPUIDLE and | 129 | * with default cpu_do_idle() hook. Used by all CPUs with !CONFIG_CPU_IDLE and |
130 | * by secondary CPU with CONFIG_CPUIDLE. | 130 | * by secondary CPU with CONFIG_CPU_IDLE. |
131 | */ | 131 | */ |
132 | static void omap_default_idle(void) | 132 | static void omap_default_idle(void) |
133 | { | 133 | { |
diff --git a/arch/blackfin/include/asm/bfin_sport3.h b/arch/blackfin/include/asm/bfin_sport3.h index 03c00220d69b..d82f5fa0ad9f 100644 --- a/arch/blackfin/include/asm/bfin_sport3.h +++ b/arch/blackfin/include/asm/bfin_sport3.h | |||
@@ -41,7 +41,7 @@ | |||
41 | #define SPORT_CTL_LAFS 0x00020000 /* Late Transmit frame select */ | 41 | #define SPORT_CTL_LAFS 0x00020000 /* Late Transmit frame select */ |
42 | #define SPORT_CTL_RJUST 0x00040000 /* Right Justified mode select */ | 42 | #define SPORT_CTL_RJUST 0x00040000 /* Right Justified mode select */ |
43 | #define SPORT_CTL_FSED 0x00080000 /* External frame sync edge select */ | 43 | #define SPORT_CTL_FSED 0x00080000 /* External frame sync edge select */ |
44 | #define SPORT_CTL_TFIEN 0x00100000 /* Transmit finish interrrupt enable select */ | 44 | #define SPORT_CTL_TFIEN 0x00100000 /* Transmit finish interrupt enable select */ |
45 | #define SPORT_CTL_GCLKEN 0x00200000 /* Gated clock mode select */ | 45 | #define SPORT_CTL_GCLKEN 0x00200000 /* Gated clock mode select */ |
46 | #define SPORT_CTL_SPENSEC 0x01000000 /* Enable secondary channel */ | 46 | #define SPORT_CTL_SPENSEC 0x01000000 /* Enable secondary channel */ |
47 | #define SPORT_CTL_SPTRAN 0x02000000 /* Data direction control */ | 47 | #define SPORT_CTL_SPTRAN 0x02000000 /* Data direction control */ |
diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c index 3bcb207e5b6d..9fe3467a5133 100644 --- a/arch/m32r/kernel/traps.c +++ b/arch/m32r/kernel/traps.c | |||
@@ -132,10 +132,8 @@ static void show_trace(struct task_struct *task, unsigned long *stack) | |||
132 | printk("Call Trace: "); | 132 | printk("Call Trace: "); |
133 | while (!kstack_end(stack)) { | 133 | while (!kstack_end(stack)) { |
134 | addr = *stack++; | 134 | addr = *stack++; |
135 | if (__kernel_text_address(addr)) { | 135 | if (__kernel_text_address(addr)) |
136 | printk("[<%08lx>] ", addr); | 136 | printk("[<%08lx>] %pSR\n", addr, (void *)addr); |
137 | print_symbol("%s\n", addr); | ||
138 | } | ||
139 | } | 137 | } |
140 | printk("\n"); | 138 | printk("\n"); |
141 | } | 139 | } |
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index bec1e930ed73..48fbc2b97e95 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c | |||
@@ -511,8 +511,7 @@ int __init nvram_scan_partitions(void) | |||
511 | "detected: 0-length partition\n"); | 511 | "detected: 0-length partition\n"); |
512 | goto out; | 512 | goto out; |
513 | } | 513 | } |
514 | tmp_part = (struct nvram_partition *) | 514 | tmp_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL); |
515 | kmalloc(sizeof(struct nvram_partition), GFP_KERNEL); | ||
516 | err = -ENOMEM; | 515 | err = -ENOMEM; |
517 | if (!tmp_part) { | 516 | if (!tmp_part) { |
518 | printk(KERN_ERR "nvram_scan_partitions: kmalloc failed\n"); | 517 | printk(KERN_ERR "nvram_scan_partitions: kmalloc failed\n"); |
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index 5e93438afb06..dbdc15aa8127 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c | |||
@@ -1039,7 +1039,7 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id) | |||
1039 | if (!vcpu_book3s) | 1039 | if (!vcpu_book3s) |
1040 | goto out; | 1040 | goto out; |
1041 | 1041 | ||
1042 | vcpu_book3s->shadow_vcpu = (struct kvmppc_book3s_shadow_vcpu *) | 1042 | vcpu_book3s->shadow_vcpu = |
1043 | kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL); | 1043 | kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL); |
1044 | if (!vcpu_book3s->shadow_vcpu) | 1044 | if (!vcpu_book3s->shadow_vcpu) |
1045 | goto free_vcpu; | 1045 | goto free_vcpu; |
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index 1630f439cd2a..4f5ef62934a4 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c | |||
@@ -33,7 +33,7 @@ struct irq_class { | |||
33 | }; | 33 | }; |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * The list of "main" irq classes on s390. This is the list of interrrupts | 36 | * The list of "main" irq classes on s390. This is the list of interrupts |
37 | * that appear both in /proc/stat ("intr" line) and /proc/interrupts. | 37 | * that appear both in /proc/stat ("intr" line) and /proc/interrupts. |
38 | * Historically only external and I/O interrupts have been part of /proc/stat. | 38 | * Historically only external and I/O interrupts have been part of /proc/stat. |
39 | * We can't add the split external and I/O sub classes since the first field | 39 | * We can't add the split external and I/O sub classes since the first field |
diff --git a/arch/s390/kvm/trace.h b/arch/s390/kvm/trace.h index 53252d2d4720..c2f582bb1cb2 100644 --- a/arch/s390/kvm/trace.h +++ b/arch/s390/kvm/trace.h | |||
@@ -67,7 +67,7 @@ TRACE_EVENT(kvm_s390_sie_fault, | |||
67 | #define sie_intercept_code \ | 67 | #define sie_intercept_code \ |
68 | {0x04, "Instruction"}, \ | 68 | {0x04, "Instruction"}, \ |
69 | {0x08, "Program interruption"}, \ | 69 | {0x08, "Program interruption"}, \ |
70 | {0x0C, "Instruction and program interuption"}, \ | 70 | {0x0C, "Instruction and program interruption"}, \ |
71 | {0x10, "External request"}, \ | 71 | {0x10, "External request"}, \ |
72 | {0x14, "External interruption"}, \ | 72 | {0x14, "External interruption"}, \ |
73 | {0x18, "I/O request"}, \ | 73 | {0x18, "I/O request"}, \ |
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h index 8d871eaddb66..d47786acb016 100644 --- a/arch/x86/include/asm/cmpxchg.h +++ b/arch/x86/include/asm/cmpxchg.h | |||
@@ -35,7 +35,7 @@ extern void __add_wrong_size(void) | |||
35 | 35 | ||
36 | /* | 36 | /* |
37 | * An exchange-type operation, which takes a value and a pointer, and | 37 | * An exchange-type operation, which takes a value and a pointer, and |
38 | * returns a the old value. | 38 | * returns the old value. |
39 | */ | 39 | */ |
40 | #define __xchg_op(ptr, arg, op, lock) \ | 40 | #define __xchg_op(ptr, arg, op, lock) \ |
41 | ({ \ | 41 | ({ \ |