Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
"Usual rocket science stuff from trivial.git"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
neighbour.h: fix comment
sched: Fix warning on make htmldocs caused by wait.h
slab: struct kmem_cache is protected by slab_mutex
doc: Fix typo in USB Gadget Documentation
of/Kconfig: Spelling s/one/once/
mkregtable: Fix sscanf handling
lp5523, lp8501: comment improvements
thermal: rcar: comment spelling
treewide: fix comments and printk msgs
IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()
Documentation: update /proc/uptime field description
Documentation: Fix size parameter for snprintf
arm: fix comment header and macro name
asm-generic: uaccess: Spelling s/a ny/any/
mtd: onenand: fix comment header
doc: driver-model/platform.txt: fix a typo
drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text
doc: Fix typo (acces_process_vm -> access_process_vm)
treewide: Fix typos in printk
drivers/gpu/drm/qxl/Kconfig: reformat the help text
...

+102 -113
+1
Documentation/DocBook/.gitignore
··· 10 10 *.out 11 11 *.png 12 12 *.gif 13 + *.svg 13 14 media-indices.tmpl 14 15 media-entities.tmpl
+3 -2
Documentation/DocBook/Makefile
··· 54 54 55 55 MAN := $(patsubst %.xml, %.9, $(BOOKS)) 56 56 mandocs: $(MAN) 57 + $(if $(wildcard $(obj)/man/*.9),gzip -f $(obj)/man/*.9) 57 58 58 59 installmandocs: mandocs 59 60 mkdir -p /usr/local/man/man9/ ··· 146 145 cat $(HTML) >> $(main_idx) 147 146 148 147 quiet_cmd_db2html = HTML $@ 149 - cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \ 148 + cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \ 150 149 echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \ 151 150 $(patsubst %.html,%,$(notdir $@))</a><p>' > $@ 152 151 ··· 160 159 cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi 161 160 162 161 quiet_cmd_db2man = MAN $@ 163 - cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi 162 + cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; fi 164 163 %.9 : %.xml 165 164 @(which xmlto > /dev/null 2>&1) || \ 166 165 (echo "*** You need to install xmlto ***"; \
+1
Documentation/DocBook/kernel-api.tmpl
··· 109 109 <sect1><title>The Slab Cache</title> 110 110 !Iinclude/linux/slab.h 111 111 !Emm/slab.c 112 + !Emm/util.c 112 113 </sect1> 113 114 <sect1><title>User Space Memory Access</title> 114 115 !Iarch/x86/include/asm/uaccess_32.h
+1 -1
Documentation/IRQ-domain.txt
··· 141 141 system and will otherwise use a linear domain mapping. The semantics 142 142 of this call are such that if an IRQ range is specified then 143 143 descriptors will be allocated on-the-fly for it, and if no range is 144 - specified it will fall through to irq_domain_add_linear() which meand 144 + specified it will fall through to irq_domain_add_linear() which means 145 145 *no* irq descriptors will be allocated. 146 146 147 147 A typical use case for simple domains is where an irqchip provider
+1 -1
Documentation/driver-model/platform.txt
··· 48 48 struct device_driver driver; 49 49 }; 50 50 51 - Note that probe() should general verify that the specified device hardware 51 + Note that probe() should in general verify that the specified device hardware 52 52 actually exists; sometimes platform setup code can't be sure. The probing 53 53 can use device resources, including clocks, and device platform_data. 54 54
+1 -1
Documentation/efi-stub.txt
··· 20 20 **** How to install bzImage.efi 21 21 22 22 The bzImage located in arch/x86/boot/bzImage must be copied to the EFI 23 - System Partiion (ESP) and renamed with the extension ".efi". Without 23 + System Partition (ESP) and renamed with the extension ".efi". Without 24 24 the extension the EFI firmware loader will refuse to execute it. It's 25 25 not possible to execute bzImage.efi from the usual Linux file systems 26 26 because EFI firmware doesn't have support for them.
+1 -1
Documentation/email-clients.txt
··· 104 104 As an added bonus you can customise the message creation toolbar menu 105 105 and put the "insert file" icon there. 106 106 107 - Make the the composer window wide enough so that no lines wrap. As of 107 + Make the composer window wide enough so that no lines wrap. As of 108 108 KMail 1.13.5 (KDE 4.5.4), KMail will apply word wrapping when sending 109 109 the email if the lines wrap in the composer window. Having word wrapping 110 110 disabled in the Options menu isn't enough. Thus, if your patch has very
+1 -1
Documentation/filesystems/Locking
··· 544 544 will cause the VM to retry the fault. 545 545 546 546 ->access() is called when get_user_pages() fails in 547 - acces_process_vm(), typically used to debug a process through 547 + access_process_vm(), typically used to debug a process through 548 548 /proc/pid/mem or ptrace. This function is needed only for 549 549 VM_IO | VM_PFNMAP VMAs. 550 550
+1 -1
Documentation/filesystems/proc.txt
··· 547 547 sys See chapter 2 548 548 sysvipc Info of SysVIPC Resources (msg, sem, shm) (2.4) 549 549 tty Info of tty drivers 550 - uptime System uptime 550 + uptime Wall clock since boot, combined idle time of all cpus 551 551 version Kernel version 552 552 video bttv info of video resources (2.4) 553 553 vmallocinfo Show vmalloced areas
+1 -1
Documentation/io-mapping.txt
··· 38 38 39 39 void io_mapping_unmap_atomic(void *vaddr) 40 40 41 - 'vaddr' must be the the value returned by the last 41 + 'vaddr' must be the value returned by the last 42 42 io_mapping_map_atomic_wc call. This unmaps the specified 43 43 page and allows the task to sleep once again. 44 44
+8 -1
Documentation/kernel-parameters.txt
··· 515 515 516 516 cgroup_disable= [KNL] Disable a particular controller 517 517 Format: {name of the controller(s) to disable} 518 - {Currently supported controllers - "memory"} 518 + The effects of cgroup_disable=foo are: 519 + - foo isn't auto-mounted if you mount all cgroups in 520 + a single hierarchy 521 + - foo isn't visible as an individually mountable 522 + subsystem 523 + {Currently only "memory" controller deal with this and 524 + cut the overhead, others just disable the usage. So 525 + only cgroup_disable=memory is actually worthy} 519 526 520 527 checkreqprot [SELINUX] Set initial checkreqprot flag value. 521 528 Format: { "0" | "1" }
+1 -1
Documentation/laptops/hpfall.c
··· 29 29 return -EINVAL; 30 30 strncpy(devname, device + 5, sizeof(devname)); 31 31 32 - snprintf(unload_heads_path, sizeof(unload_heads_path), 32 + snprintf(unload_heads_path, sizeof(unload_heads_path) - 1, 33 33 "/sys/block/%s/device/unload_heads", devname); 34 34 return 0; 35 35 }
+1 -1
Documentation/md.txt
··· 533 533 found. The count in 'mismatch_cnt' is the number of sectors 534 534 that were re-written, or (for 'check') would have been 535 535 re-written. As most raid levels work in units of pages rather 536 - than sectors, this my be larger than the number of actual errors 536 + than sectors, this may be larger than the number of actual errors 537 537 by a factor of the number of sectors in a page. 538 538 539 539 bitmap_set_bits
+1 -1
Documentation/rfkill.txt
··· 71 71 depends on RFKILL || !RFKILL 72 72 73 73 to ensure the driver cannot be built-in when rfkill is modular. The !RFKILL 74 - case allows the driver to be built when rfkill is not configured, which which 74 + case allows the driver to be built when rfkill is not configured, which 75 75 case all rfkill API can still be used but will be provided by static inlines 76 76 which compile to almost nothing. 77 77
+1 -1
Documentation/rt-mutex-design.txt
··· 30 30 priority process is prevented from running by a lower priority process for 31 31 an undetermined amount of time. 32 32 33 - The classic example of unbounded priority inversion is were you have three 33 + The classic example of unbounded priority inversion is where you have three 34 34 processes, let's call them processes A, B, and C, where A is the highest 35 35 priority process, C is the lowest, and B is in between. A tries to grab a lock 36 36 that C owns and must wait and lets C run to release the lock. But in the
+2 -2
Documentation/static-keys.txt
··· 116 116 static_key_slow_dec(&key); 117 117 118 118 Thus, 'static_key_slow_inc()' means 'make the branch true', and 119 - 'static_key_slow_dec()' means 'make the the branch false' with appropriate 119 + 'static_key_slow_dec()' means 'make the branch false' with appropriate 120 120 reference counting. For example, if the key is initialized true, a 121 121 static_key_slow_dec(), will switch the branch to false. And a subsequent 122 122 static_key_slow_inc(), will change the branch back to true. Likewise, if the ··· 236 236 237 237 If we then include the padding bytes, the jump label code saves, 16 total bytes 238 238 of instruction memory for this small function. In this case the non-jump label 239 - function is 80 bytes long. Thus, we have have saved 20% of the instruction 239 + function is 80 bytes long. Thus, we have saved 20% of the instruction 240 240 footprint. We can in fact improve this even further, since the 5-byte no-op 241 241 really can be a 2-byte no-op since we can reach the branch with a 2-byte jmp. 242 242 However, we have not yet implemented optimal no-op sizes (they are currently
+1 -1
Documentation/usb/gadget_multi.txt
··· 14 14 and RNDIS can be turned off. If they are both enabled the gadget will 15 15 have two configurations -- one with RNDIS and another with CDC ECM[3]. 16 16 17 - Please not that if you use non-standard configuration (that is enable 17 + Please note that if you use non-standard configuration (that is enable 18 18 CDC ECM) you may need to change vendor and/or product ID. 19 19 20 20 * Host drivers
-23
Documentation/x86/x86_64/boot-options.txt
··· 78 78 79 79 no_timer_check Don't check the IO-APIC timer. This can work around 80 80 problems with incorrect timer initialization on some boards. 81 - 82 - apicmaintimer Run time keeping from the local APIC timer instead 83 - of using the PIT/HPET interrupt for this. This is useful 84 - when the PIT/HPET interrupts are unreliable. 85 - 86 - noapicmaintimer Don't do time keeping using the APIC timer. 87 - Useful when this option was auto selected, but doesn't work. 88 - 89 81 apicpmtimer 90 82 Do APIC timer calibration using the pmtimer. Implies 91 83 apicmaintimer. Useful when your PIT timer is totally ··· 135 143 136 144 on Enable(default) 137 145 off Disable 138 - 139 - SMP 140 - 141 - additional_cpus=NUM Allow NUM more CPUs for hotplug 142 - (defaults are specified by the BIOS, see Documentation/x86/x86_64/cpu-hotplug-spec) 143 146 144 147 NUMA 145 148 ··· 275 288 Debugging 276 289 277 290 kstack=N Print N words from the kernel stack in oops dumps. 278 - 279 - pagefaulttrace Dump all page faults. Only useful for extreme debugging 280 - and will create a lot of output. 281 - 282 - call_trace=[old|both|newfallback|new] 283 - old: use old inexact backtracer 284 - new: use new exact dwarf2 unwinder 285 - both: print entries from both 286 - newfallback: use new unwinder but fall back to old if it gets 287 - stuck (default) 288 291 289 292 Miscellaneous 290 293
+1 -1
arch/arm/mach-at91/Kconfig.non_dt
··· 241 241 bool "PControl G20 CPU module" 242 242 help 243 243 Select this if you are using taskit's Stamp9G20 CPU module on this 244 - carrier board, beeing the decentralized unit of a building automation 244 + carrier board, being the decentralized unit of a building automation 245 245 system; featuring nvram, eth-switch, iso-rs485, display, io 246 246 247 247 config MACH_GSIA18S
+1 -1
arch/arm/mach-imx/mach-pca100.c
··· 249 249 "imx-mmc-detect", data); 250 250 if (ret) 251 251 printk(KERN_ERR 252 - "pca100: Failed to reuest irq for sd/mmc detection\n"); 252 + "pca100: Failed to request irq for sd/mmc detection\n"); 253 253 254 254 return ret; 255 255 }
+1 -1
arch/arm/mach-ixp4xx/common.c
··· 560 560 561 561 void ixp4xx_restart(enum reboot_mode mode, const char *cmd) 562 562 { 563 - if ( 1 && mode == REBOOT_SOFT) { 563 + if (mode == REBOOT_SOFT) { 564 564 /* Jump into ROM at address 0 */ 565 565 soft_restart(0); 566 566 } else {
+1 -1
arch/arm64/kvm/handle_exit.c
··· 90 90 91 91 if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) || 92 92 !arm_exit_handlers[hsr_ec]) { 93 - kvm_err("Unkown exception class: hsr: %#08x\n", 93 + kvm_err("Unknown exception class: hsr: %#08x\n", 94 94 (unsigned int)kvm_vcpu_get_hsr(vcpu)); 95 95 BUG(); 96 96 }
+1 -1
arch/mips/ralink/cevt-rt3352.c
··· 138 138 139 139 clockevents_register_device(&systick.dev); 140 140 141 - pr_info("%s: runing - mult: %d, shift: %d\n", 141 + pr_info("%s: running - mult: %d, shift: %d\n", 142 142 np->name, systick.dev.mult, systick.dev.shift); 143 143 } 144 144
+1 -1
arch/mips/ralink/timer.c
··· 147 147 rt_timer_config(rt, 2); 148 148 rt_timer_enable(rt); 149 149 150 - dev_info(&pdev->dev, "maximum frequncy is %luHz\n", rt->timer_freq); 150 + dev_info(&pdev->dev, "maximum frequency is %luHz\n", rt->timer_freq); 151 151 152 152 return 0; 153 153 }
+1 -1
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
··· 245 245 246 246 if (dma && !write) { 247 247 spin_unlock_irqrestore(&lpbfifo.lock, flags); 248 - pr_err("bogus LPBFIFO IRQ (dma and not writting)\n"); 248 + pr_err("bogus LPBFIFO IRQ (dma and not writing)\n"); 249 249 return IRQ_HANDLED; 250 250 } 251 251
+2 -2
arch/powerpc/platforms/powernv/opal-flash.c
··· 126 126 127 127 struct validate_flash_t { 128 128 int status; /* Return status */ 129 - void *buf; /* Candiate image buffer */ 129 + void *buf; /* Candidate image buffer */ 130 130 uint32_t buf_size; /* Image size */ 131 131 uint32_t result; /* Update results token */ 132 132 }; ··· 500 500 501 501 memcpy(&image_header, (void *)buffer, sizeof(struct image_header_t)); 502 502 image_data.size = be32_to_cpu(image_header.size); 503 - pr_debug("FLASH: Candiate image size = %u\n", image_data.size); 503 + pr_debug("FLASH: Candidate image size = %u\n", image_data.size); 504 504 505 505 if (image_data.size > MAX_IMAGE_SIZE) { 506 506 pr_warn("FLASH: Too large image\n");
+1 -1
arch/x86/Kconfig
··· 938 938 depends on X86_32 && X86_MCE 939 939 ---help--- 940 940 Include support for machine check handling on old Pentium 5 or WinChip 941 - systems. These typically need to be enabled explicitely on the command 941 + systems. These typically need to be enabled explicitly on the command 942 942 line. 943 943 944 944 config X86_MCE_THRESHOLD
+1 -1
drivers/base/Kconfig
··· 49 49 with the commandline parameter: devtmpfs.mount=0|1. 50 50 This option does not affect initramfs based booting, here 51 51 the devtmpfs filesystem always needs to be mounted manually 52 - after the roots is mounted. 52 + after the rootfs is mounted. 53 53 With this option enabled, it allows to bring up a system in 54 54 rescue mode with init=/bin/sh, even when the /dev directory 55 55 on the rootfs is completely empty.
-1
drivers/block/Makefile
··· 31 31 obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o 32 32 obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o 33 33 34 - obj-$(CONFIG_VIODASD) += viodasd.o 35 34 obj-$(CONFIG_BLK_DEV_SX8) += sx8.o 36 35 obj-$(CONFIG_BLK_DEV_HD) += hd.o 37 36
-1
drivers/cdrom/Makefile
··· 10 10 obj-$(CONFIG_PARIDE_PCD) += cdrom.o 11 11 obj-$(CONFIG_CDROM_PKTCDVD) += cdrom.o 12 12 13 - obj-$(CONFIG_VIOCD) += viocd.o cdrom.o 14 13 obj-$(CONFIG_GDROM) += gdrom.o cdrom.o
-1
drivers/char/Makefile
··· 13 13 obj-$(CONFIG_MSPEC) += mspec.o 14 14 obj-$(CONFIG_MMTIMER) += mmtimer.o 15 15 obj-$(CONFIG_UV_MMTIMER) += uv_mmtimer.o 16 - obj-$(CONFIG_VIOTAPE) += viotape.o 17 16 obj-$(CONFIG_IBM_BSR) += bsr.o 18 17 obj-$(CONFIG_SGI_MBCS) += mbcs.o 19 18 obj-$(CONFIG_BFIN_OTP) += bfin-otp.o
+1 -1
drivers/char/msm_smd_pkt.c
··· 182 182 if (count > MAX_BUF_SIZE) 183 183 return -EINVAL; 184 184 185 - DBG("writting %d bytes\n", count); 185 + DBG("writing %d bytes\n", count); 186 186 187 187 smd_pkt_devp = file->private_data; 188 188 if (!smd_pkt_devp || !smd_pkt_devp->ch)
+1 -1
drivers/devfreq/exynos/exynos4_bus.c
··· 116 116 }; 117 117 118 118 /* 119 - * MIF is the main control knob clock for exynox4x12 MIF/INT 119 + * MIF is the main control knob clock for Exynos4x12 MIF/INT 120 120 * clock and voltage of both mif/int are controlled. 121 121 */ 122 122 static struct bus_opp_table exynos4x12_mifclk_table[] = {
+1 -1
drivers/devfreq/exynos/exynos5_bus.c
··· 152 152 if (old_freq == freq) 153 153 return 0; 154 154 155 - dev_dbg(dev, "targetting %lukHz %luuV\n", freq, volt); 155 + dev_dbg(dev, "targeting %lukHz %luuV\n", freq, volt); 156 156 157 157 mutex_lock(&data->lock); 158 158
+2 -2
drivers/gpu/drm/exynos/exynos_drm_crtc.c
··· 36 36 * @pipe: a crtc index created at load() with a new crtc object creation 37 37 * and the crtc object would be set to private->crtc array 38 38 * to get a crtc object corresponding to this pipe from private->crtc 39 - * array when irq interrupt occured. the reason of using this pipe is that 39 + * array when irq interrupt occurred. the reason of using this pipe is that 40 40 * drm framework doesn't support multiple irq yet. 41 - * we can refer to the crtc to current hardware interrupt occured through 41 + * we can refer to the crtc to current hardware interrupt occurred through 42 42 * this pipe value. 43 43 * @dpms: store the crtc dpms value 44 44 * @mode: store the crtc mode value
+1 -1
drivers/gpu/drm/exynos/exynos_drm_fimc.c
··· 345 345 346 346 fimc_write(cfg, EXYNOS_CIWDOFST); 347 347 348 - dev_err(ippdrv->dev, "occured overflow at %d, status 0x%x.\n", 348 + dev_err(ippdrv->dev, "occurred overflow at %d, status 0x%x.\n", 349 349 ctx->id, status); 350 350 return true; 351 351 }
+1 -1
drivers/gpu/drm/exynos/exynos_drm_g2d.c
··· 1126 1126 * G2D interrupt event once current command list execution is 1127 1127 * finished. 1128 1128 * Otherwise only ACF bit should be set to INTEN register so 1129 - * that one interrupt is occured after all command lists 1129 + * that one interrupt is occurred after all command lists 1130 1130 * have been completed. 1131 1131 */ 1132 1132 if (node->event) {
+1 -1
drivers/gpu/drm/exynos/exynos_drm_gem.c
··· 652 652 int ret; 653 653 654 654 /* 655 - * alocate memory to be used for framebuffer. 655 + * allocate memory to be used for framebuffer. 656 656 * - this callback would be called by user application 657 657 * with DRM_IOCTL_MODE_CREATE_DUMB command. 658 658 */
+1 -1
drivers/gpu/drm/exynos/exynos_drm_gem.h
··· 60 60 * @vma: a pointer to vm_area. 61 61 * @flags: indicate memory type to allocated buffer and cache attruibute. 62 62 * 63 - * P.S. this object would be transfered to user as kms_bo.handle so 63 + * P.S. this object would be transferred to user as kms_bo.handle so 64 64 * user can access the buffer through kms_bo.handle. 65 65 */ 66 66 struct exynos_drm_gem_obj {
+2 -2
drivers/gpu/drm/exynos/exynos_drm_gsc.c
··· 1301 1301 1302 1302 status = gsc_read(GSC_IRQ); 1303 1303 if (status & GSC_IRQ_STATUS_OR_IRQ) { 1304 - dev_err(ippdrv->dev, "occured overflow at %d, status 0x%x.\n", 1304 + dev_err(ippdrv->dev, "occurred overflow at %d, status 0x%x.\n", 1305 1305 ctx->id, status); 1306 1306 return IRQ_NONE; 1307 1307 } 1308 1308 1309 1309 if (status & GSC_IRQ_STATUS_OR_FRM_DONE) { 1310 - dev_dbg(ippdrv->dev, "occured frame done at %d, status 0x%x.\n", 1310 + dev_dbg(ippdrv->dev, "occurred frame done at %d, status 0x%x.\n", 1311 1311 ctx->id, status); 1312 1312 1313 1313 buf_id[EXYNOS_DRM_OPS_SRC] = gsc_get_src_buf_index(ctx);
+1 -1
drivers/gpu/drm/exynos/exynos_drm_ipp.c
··· 335 335 } else { 336 336 /* 337 337 * Getting ippdrv capability by ipp_id. 338 - * some deivce not supported wb, output interface. 338 + * some device not supported wb, output interface. 339 339 * so, user application detect correct ipp driver 340 340 * using this ioctl. 341 341 */
+2 -2
drivers/gpu/drm/exynos/exynos_drm_ipp.h
··· 48 48 /* 49 49 * A structure of command node. 50 50 * 51 - * @priv: IPP private infomation. 51 + * @priv: IPP private information. 52 52 * @list: list head to command queue information. 53 53 * @event_list: list head of event. 54 54 * @mem_list: list head to source,destination memory queue information. ··· 92 92 }; 93 93 94 94 /* 95 - * A structure of wb setting infomation. 95 + * A structure of wb setting information. 96 96 * 97 97 * @enable: enable flag for wb. 98 98 * @refresh: HZ of the refresh rate.
+5 -3
drivers/gpu/drm/qxl/Kconfig
··· 5 5 select FB_SYS_COPYAREA 6 6 select FB_SYS_IMAGEBLIT 7 7 select FB_DEFERRED_IO 8 - select DRM_KMS_HELPER 8 + select DRM_KMS_HELPER 9 9 select DRM_KMS_FB_HELPER 10 - select DRM_TTM 10 + select DRM_TTM 11 11 select CRC32 12 12 help 13 - QXL virtual GPU for Spice virtualization desktop integration. Do not enable this driver unless your distro ships a corresponding X.org QXL driver that can handle kernel modesetting. 13 + QXL virtual GPU for Spice virtualization desktop integration. 14 + Do not enable this driver unless your distro ships a corresponding 15 + X.org QXL driver that can handle kernel modesetting.
+1 -1
drivers/gpu/drm/radeon/mkregtable.c
··· 655 655 656 656 /* first line will contain the last register 657 657 * and gpu name */ 658 - sscanf(buf, "%s %s", gpu_name, last_reg_s); 658 + sscanf(buf, "%9s %9s", gpu_name, last_reg_s); 659 659 t->gpu_prefix = gpu_name; 660 660 last_reg = strtol(last_reg_s, NULL, 16); 661 661
+1 -1
drivers/i2c/busses/i2c-exynos5.c
··· 571 571 int i = 0, ret = 0, stop = 0; 572 572 573 573 if (i2c->suspended) { 574 - dev_err(i2c->dev, "HS-I2C is not initialzed.\n"); 574 + dev_err(i2c->dev, "HS-I2C is not initialized.\n"); 575 575 return -EIO; 576 576 } 577 577
+1 -1
drivers/i2c/busses/i2c-stu300.c
··· 801 801 /* Check that the bus is free, or wait until some timeout occurs */ 802 802 ret = stu300_wait_while_busy(dev); 803 803 if (ret != 0) { 804 - dev_err(&dev->pdev->dev, "timout waiting for transfer " 804 + dev_err(&dev->pdev->dev, "timeout waiting for transfer " 805 805 "to commence.\n"); 806 806 goto exit_disable; 807 807 }
+1 -1
drivers/iio/adc/twl6030-gpadc.c
··· 969 969 ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, TWL6030_GPADCR, 970 970 TWL6030_REG_TOGGLE1); 971 971 if (ret) 972 - dev_err(pdev, "error reseting GPADC (%d)!\n", ret); 972 + dev_err(pdev, "error resetting GPADC (%d)!\n", ret); 973 973 974 974 return 0; 975 975 };
+1 -1
drivers/isdn/hisax/hfc4s8s_l1.c
··· 1620 1620 #else 1621 1621 if (!request_region(hw->iobase, 8, hw->card_name)) { 1622 1622 printk(KERN_INFO 1623 - "HFC-4S/8S: failed to rquest address space at 0x%04x\n", 1623 + "HFC-4S/8S: failed to request address space at 0x%04x\n", 1624 1624 hw->iobase); 1625 1625 goto out; 1626 1626 }
+1 -1
drivers/isdn/mISDN/Kconfig
··· 17 17 18 18 This module may be used for special applications that require 19 19 cross connecting of bchannels, conferencing, dtmf decoding, 20 - echo cancelation, tone generation, and Blowfish encryption and 20 + echo cancellation, tone generation, and Blowfish encryption and 21 21 decryption. It may use hardware features if available. 22 22 23 23 E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu
+9 -1
drivers/leds/leds-lp5523.c
··· 35 35 36 36 #include "leds-lp55xx-common.h" 37 37 38 - #define LP5523_PROGRAM_LENGTH 32 38 + #define LP5523_PROGRAM_LENGTH 32 /* bytes */ 39 + /* Memory is used like this: 40 + 0x00 engine 1 program 41 + 0x10 engine 2 program 42 + 0x20 engine 3 program 43 + 0x30 engine 1 muxing info 44 + 0x40 engine 2 muxing info 45 + 0x50 engine 3 muxing info 46 + */ 39 47 #define LP5523_MAX_LEDS 9 40 48 41 49 /* Registers */
+1 -1
drivers/leds/leds-lp8501.c
··· 263 263 } 264 264 265 265 /* 266 - * Program momery sequence 266 + * Program memory sequence 267 267 * 1) set engine mode to "LOAD" 268 268 * 2) write firmware data into program memory 269 269 */
+2 -2
drivers/media/platform/ti-vpe/vpdma.c
··· 577 577 pr_debug("word5: max_width %d, max_height %d\n", 578 578 dtd_get_max_width(dtd), dtd_get_max_height(dtd)); 579 579 580 - pr_debug("word6: client specfic attr0 = 0x%08x\n", dtd->client_attr0); 581 - pr_debug("word7: client specfic attr1 = 0x%08x\n", dtd->client_attr1); 580 + pr_debug("word6: client specific attr0 = 0x%08x\n", dtd->client_attr0); 581 + pr_debug("word7: client specific attr1 = 0x%08x\n", dtd->client_attr1); 582 582 } 583 583 584 584 /*
+1 -1
drivers/misc/fsa9480.c
··· 396 396 IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 397 397 "fsa9480 micro USB", usbsw); 398 398 if (ret) { 399 - dev_err(&client->dev, "failed to reqeust IRQ\n"); 399 + dev_err(&client->dev, "failed to request IRQ\n"); 400 400 return ret; 401 401 } 402 402
-2
drivers/mtd/onenand/samsung.h
··· 1 1 /* 2 - * linux/arch/arm/plat-s3c/include/plat/regs-onenand.h 3 - * 4 2 * Copyright (C) 2008-2010 Samsung Electronics 5 3 * Kyungmin Park <kyungmin.park@samsung.com> 6 4 *
+1 -1
drivers/net/wan/lmc/lmc_main.c
··· 2126 2126 2127 2127 spin_unlock_irqrestore(&sc->lmc_lock, flags); 2128 2128 2129 - lmc_trace(dev, "lmc_driver_timout out"); 2129 + lmc_trace(dev, "lmc_driver_timeout out"); 2130 2130 2131 2131 2132 2132 }
+1 -1
drivers/net/wireless/libertas/cmdresp.c
··· 248 248 /* handle unexpected PS SLEEP event */ 249 249 if (priv->psstate == PS_STATE_FULL_POWER) { 250 250 lbs_deb_cmd( 251 - "EVENT: in FULL POWER mode, ignoreing PS_SLEEP\n"); 251 + "EVENT: in FULL POWER mode, ignoring PS_SLEEP\n"); 252 252 break; 253 253 } 254 254 priv->psstate = PS_STATE_PRE_SLEEP;
+2 -2
drivers/scsi/Kconfig
··· 204 204 Some devices support more than one LUN (Logical Unit Number) in order 205 205 to allow access to several media, e.g. CD jukebox, USB card reader, 206 206 mobile phone in mass storage mode. This option forces the kernel to 207 - probe for all LUNs by default. This setting can be overriden by 207 + probe for all LUNs by default. This setting can be overridden by 208 208 max_luns boot/module parameter. Note that this option does not affect 209 - devices conforming to SCSI-3 or higher as they can explicitely report 209 + devices conforming to SCSI-3 or higher as they can explicitly report 210 210 their number of LUNs. It is safe to say Y here unless you have one of 211 211 those rare devices which reacts in an unexpected way when probed for 212 212 multiple LUNs.
+1 -1
drivers/scsi/qla2xxx/qla_nx2.c
··· 2254 2254 2255 2255 if (r_addr & 0xf) { 2256 2256 ql_dbg(ql_dbg_p3p, vha, 0xb0f1, 2257 - "[%s]: Read addr 0x%x not 16 bytes alligned\n", 2257 + "[%s]: Read addr 0x%x not 16 bytes aligned\n", 2258 2258 __func__, r_addr); 2259 2259 return QLA_FUNCTION_FAILED; 2260 2260 }
+1 -1
drivers/scsi/qla4xxx/ql4_83xx.c
··· 465 465 } 466 466 /* Recovery Failed, some other function 467 467 * has the lock, wait for 2secs and retry */ 468 - ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timout\n", 468 + ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timeout\n", 469 469 __func__, ha->func_num); 470 470 timeout = 0; 471 471 }
-1
drivers/staging/usbip/usbip_common.c
··· 367 367 msg.msg_namelen = 0; 368 368 msg.msg_control = NULL; 369 369 msg.msg_controllen = 0; 370 - msg.msg_namelen = 0; 371 370 msg.msg_flags = MSG_NOSIGNAL; 372 371 373 372 result = kernel_recvmsg(sock, &msg, &iov, 1, size, MSG_WAITALL);
+1 -1
drivers/thermal/rcar_thermal.c
··· 408 408 /* enable temperature comparation */ 409 409 rcar_thermal_common_write(common, ENR, 0x00030303); 410 410 411 - idle = 0; /* polling delaye is not needed */ 411 + idle = 0; /* polling delay is not needed */ 412 412 } 413 413 414 414 for (i = 0;; i++) {
+1 -1
drivers/tty/serial/crisv10.c
··· 2153 2153 2154 2154 fast_timers[info->line].function = NULL; 2155 2155 serial_fast_timer_expired++; 2156 - TIMERD(DEBUG_LOG(info->line, "flush_timout %i ", info->line)); 2156 + TIMERD(DEBUG_LOG(info->line, "flush_timeout %i ", info->line)); 2157 2157 TIMERD(DEBUG_LOG(info->line, "num expired: %i\n", serial_fast_timer_expired)); 2158 2158 check_flush_timeout(info); 2159 2159 }
+1 -1
drivers/usb/serial/kobil_sct.c
··· 193 193 KOBIL_TIMEOUT 194 194 ); 195 195 dev_dbg(dev, "%s - Send get_HW_version URB returns: %i\n", __func__, result); 196 - dev_dbg(dev, "Harware version: %i.%i.%i\n", transfer_buffer[0], 196 + dev_dbg(dev, "Hardware version: %i.%i.%i\n", transfer_buffer[0], 197 197 transfer_buffer[1], transfer_buffer[2]); 198 198 199 199 /* get firmware version */
+1 -1
drivers/video/udlfb.c
··· 1624 1624 } 1625 1625 1626 1626 if (pixel_limit) { 1627 - pr_warn("DL chip limit of %d overriden" 1627 + pr_warn("DL chip limit of %d overridden" 1628 1628 " by module param to %d\n", 1629 1629 dev->sku_pixel_limit, pixel_limit); 1630 1630 dev->sku_pixel_limit = pixel_limit;
+1 -1
drivers/xen/Kconfig
··· 222 222 223 223 To do that the driver parses the Power Management data and uploads 224 224 said information to the Xen hypervisor. Then the Xen hypervisor can 225 - select the proper Cx and Pxx states. It also registers itslef as the 225 + select the proper Cx and Pxx states. It also registers itself as the 226 226 SMM so that other drivers (such as ACPI cpufreq scaling driver) will 227 227 not load. 228 228
+2 -2
fs/btrfs/tests/free-space-tests.c
··· 101 101 102 102 ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096); 103 103 if (ret) { 104 - test_msg("Error removing middle peice %d\n", ret); 104 + test_msg("Error removing middle piece %d\n", ret); 105 105 return ret; 106 106 } 107 107 ··· 266 266 } 267 267 268 268 if (test_check_exists(cache, 512 * 1024, 3 * 1024 * 1024)) { 269 - test_msg("Left over peices after removing overlapping\n"); 269 + test_msg("Left over pieces after removing overlapping\n"); 270 270 return -1; 271 271 } 272 272
+1 -1
include/asm-generic/uaccess.h
··· 3 3 4 4 /* 5 5 * User space memory access functions, these should work 6 - * on a ny machine that has kernel and user data in the same 6 + * on any machine that has kernel and user data in the same 7 7 * address space, e.g. all NOMMU machines. 8 8 */ 9 9 #include <linux/sched.h>
+3 -5
include/linux/amba/sp810.h
··· 1 1 /* 2 - * arch/arm/include/asm/hardware/sp810.h 3 - * 4 2 * ARM PrimeXsys System Controller SP810 header file 5 3 * 6 4 * Copyright (C) 2009 ST Microelectronics ··· 9 11 * warranty of any kind, whether express or implied. 10 12 */ 11 13 12 - #ifndef __ASM_ARM_SP810_H 13 - #define __ASM_ARM_SP810_H 14 + #ifndef __AMBA_SP810_H 15 + #define __AMBA_SP810_H 14 16 15 17 #include <linux/io.h> 16 18 ··· 59 61 writel(0, base + SCSYSSTAT); 60 62 } 61 63 62 - #endif /* __ASM_ARM_SP810_H */ 64 + #endif /* __AMBA_SP810_H */
+1 -1
include/linux/slab_def.h
··· 6 6 */ 7 7 8 8 struct kmem_cache { 9 - /* 1) Cache tunables. Protected by cache_chain_mutex */ 9 + /* 1) Cache tunables. Protected by slab_mutex */ 10 10 unsigned int batchcount; 11 11 unsigned int limit; 12 12 unsigned int shared;
+1 -1
include/linux/tracepoint.h
··· 276 276 * For use with the TRACE_EVENT macro: 277 277 * 278 278 * We define a tracepoint, its arguments, its printk format 279 - * and its 'fast binay record' layout. 279 + * and its 'fast binary record' layout. 280 280 * 281 281 * Firstly, name your tracepoint via TRACE_EVENT(name : the 282 282 * 'subsystem_event' notation is fine.
+2 -2
include/linux/wait.h
··· 286 286 * wait_event_cmd - sleep until a condition gets true 287 287 * @wq: the waitqueue to wait on 288 288 * @condition: a C expression for the event to wait for 289 - * cmd1: the command will be executed before sleep 290 - * cmd2: the command will be executed after sleep 289 + * @cmd1: the command will be executed before sleep 290 + * @cmd2: the command will be executed after sleep 291 291 * 292 292 * The process is put to sleep (TASK_UNINTERRUPTIBLE) until the 293 293 * @condition evaluates to true. The @condition is checked each time
+1 -1
include/uapi/linux/neighbour.h
··· 58 58 59 59 /* NUD_NOARP & NUD_PERMANENT are pseudostates, they never change 60 60 and make no address resolution or NUD. 61 - NUD_PERMANENT is also cannot be deleted by garbage collectors. 61 + NUD_PERMANENT also cannot be deleted by garbage collectors. 62 62 */ 63 63 64 64 struct nda_cacheinfo {
+1 -1
net/core/dev.c
··· 6229 6229 * @rxqs: the number of RX subqueues to allocate 6230 6230 * 6231 6231 * Allocates a struct net_device with private data area for driver use 6232 - * and performs basic initialization. Also allocates subquue structs 6232 + * and performs basic initialization. Also allocates subqueue structs 6233 6233 * for each queue on the device. 6234 6234 */ 6235 6235 struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
+1 -1
net/netfilter/ipset/Kconfig
··· 21 21 You can define here default value of the maximum number 22 22 of IP sets for the kernel. 23 23 24 - The value can be overriden by the 'max_sets' module 24 + The value can be overridden by the 'max_sets' module 25 25 parameter of the 'ip_set' module. 26 26 27 27 config IP_SET_BITMAP_IP
+1 -1
net/nfc/digital_dep.c
··· 563 563 rf_tech = NFC_DIGITAL_RF_TECH_424F; 564 564 break; 565 565 default: 566 - pr_err("Unsuported dsi value %d\n", dsi); 566 + pr_err("Unsupported dsi value %d\n", dsi); 567 567 goto exit; 568 568 } 569 569
+1 -1
net/nfc/hci/llc_shdlc.c
··· 300 300 { 301 301 struct sk_buff *skb; 302 302 303 - pr_debug("remote asks retransmition from frame %d\n", y_nr); 303 + pr_debug("remote asks retransmission from frame %d\n", y_nr); 304 304 305 305 if (llc_shdlc_x_lteq_y_lt_z(shdlc->dnr, y_nr, shdlc->ns)) { 306 306 if (shdlc->t2_active) {