GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-03-18 04:54:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Pull "trivial tree" updates from Jiri Kosina:
 "Usual pile from trivial tree everyone is so eagerly waiting for"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Remove MN10300_PROC_MN2WS0038
  mei: fix comments
  treewide: Fix typos in Kconfig
  kprobes: update jprobe_example.c for do_fork() change
  Documentation: change "&" to "and" in Documentation/applying-patches.txt
  Documentation: remove obsolete pcmcia-cs from Changes
  Documentation: update links in Changes
  Documentation: Docbook: Fix generated DocBook/kernel-api.xml
  score: Remove GENERIC_HAS_IOMAP
  gpio: fix 'CONFIG_GPIO_IRQCHIP' comments
  tty: doc: Fix grammar in serial/tty
  dma-debug: modify check_for_stack output
  treewide: fix errors in printk
  genirq: fix reference in devm_request_threaded_irq comment
  treewide: fix synchronize_rcu() in comments
  checkstack.pl: port to AArch64
  doc: queue-sysfs: minor fixes
  init/do_mounts: better syntax description
  MIPS: fix comment spelling
  powerpc/simpleboot: fix comment
  ...
This commit is contained in:
Linus Torvalds 2014-10-07 21:16:26 -04:00
commit 28596c9722
92 changed files with 125 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/ABI/testing/sysfs-class-net
View file

@ -159,7 +159,7 @@ Description:
lower-level interface protocol used. Ethernet devices will show lower-level interface protocol used. Ethernet devices will show
a 'mtu' attribute value of 1500 unless changed. a 'mtu' attribute value of 1500 unless changed.
What: /sys/calss/net/<iface>/netdev_group What: /sys/class/net/<iface>/netdev_group
Date: January 2011 Date: January 2011
KernelVersion: 2.6.39 KernelVersion: 2.6.39
Contact: netdev@vger.kernel.org Contact: netdev@vger.kernel.org

21
Documentation/Changes
View file

@ -167,18 +167,11 @@ later is recommended, due to some significant improvements).
PCMCIAutils PCMCIAutils
----------- -----------
PCMCIAutils replaces pcmcia-cs (see below). It properly sets up PCMCIAutils replaces pcmcia-cs. It properly sets up
PCMCIA sockets at system startup and loads the appropriate modules PCMCIA sockets at system startup and loads the appropriate modules
for 16-bit PCMCIA devices if the kernel is modularized and the hotplug for 16-bit PCMCIA devices if the kernel is modularized and the hotplug
subsystem is used. subsystem is used.
Pcmcia-cs
---------
PCMCIA (PC Card) support is now partially implemented in the main
kernel source. The "pcmciautils" package (see above) replaces pcmcia-cs
for newest kernels.
Quota-tools Quota-tools
----------- -----------
@ -341,17 +334,13 @@ Pcmciautils
----------- -----------
o <ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/> o <ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/>
Pcmcia-cs
---------
o <http://pcmcia-cs.sourceforge.net/>
Quota-tools Quota-tools
---------- ----------
o <http://sourceforge.net/projects/linuxquota/> o <http://sourceforge.net/projects/linuxquota/>
DocBook Stylesheets DocBook Stylesheets
------------------- -------------------
o <http://nwalsh.com/docbook/dsssl/> o <http://sourceforge.net/projects/docbook/files/docbook-dsssl/>
XMLTO XSLT Frontend XMLTO XSLT Frontend
------------------- -------------------
@ -359,11 +348,11 @@ o <http://cyberelk.net/tim/xmlto/>
Intel P6 microcode Intel P6 microcode
------------------ ------------------
o <http://www.urbanmyth.org/microcode/> o <https://downloadcenter.intel.com/>
udev udev
---- ----
o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html> o <http://www.freedesktop.org/software/systemd/man/udev.html>
FUSE FUSE
---- ----
@ -371,7 +360,7 @@ o <http://sourceforge.net/projects/fuse>
mcelog mcelog
------ ------
o <ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/> o <http://www.mcelog.org/>
Networking Networking
********** **********

2
Documentation/CodingStyle
View file

@ -675,7 +675,7 @@ the ones already enabled by DEBUG.
Many subsystems have Kconfig debug options to turn on -DDEBUG in the Many subsystems have Kconfig debug options to turn on -DDEBUG in the
corresponding Makefile; in other cases specific files #define DEBUG. And corresponding Makefile; in other cases specific files #define DEBUG. And
when a debug message should be unconditionally printed, such as if it is when a debug message should be unconditionally printed, such as if it is
already inside a debug-related #ifdef secton, printk(KERN_DEBUG ...) can be already inside a debug-related #ifdef section, printk(KERN_DEBUG ...) can be
used. used.

2
Documentation/applying-patches.txt
View file

@ -94,7 +94,7 @@ Common errors when patching
--- ---
When patch applies a patch file it attempts to verify the sanity of the When patch applies a patch file it attempts to verify the sanity of the
file in different ways. file in different ways.
Checking that the file looks like a valid patch file & checking the code Checking that the file looks like a valid patch file and checking the code
around the bits being modified matches the context provided in the patch are around the bits being modified matches the context provided in the patch are
just two of the basic sanity checks patch does. just two of the basic sanity checks patch does.

4
Documentation/block/null_blk.txt
View file

@ -42,7 +42,7 @@ nr_devices=[Number of devices]: Default: 2
Number of block devices instantiated. They are instantiated as /dev/nullb0, Number of block devices instantiated. They are instantiated as /dev/nullb0,
etc. etc.
irq_mode=[0-2]: Default: 1-Soft-irq irqmode=[0-2]: Default: 1-Soft-irq
The completion mode used for completing IOs to the block-layer. The completion mode used for completing IOs to the block-layer.
0: None. 0: None.
@ -53,7 +53,7 @@ irq_mode=[0-2]: Default: 1-Soft-irq
completion. completion.
completion_nsec=[ns]: Default: 10.000ns completion_nsec=[ns]: Default: 10.000ns
Combined with irq_mode=2 (timer). The time each completion event must wait. Combined with irqmode=2 (timer). The time each completion event must wait.
submit_queues=[0..nr_cpus]: submit_queues=[0..nr_cpus]:
The number of submission queues attached to the device driver. If unset, it The number of submission queues attached to the device driver. If unset, it

6
Documentation/block/queue-sysfs.txt
View file

@ -11,7 +11,7 @@ read-write.
add_random (RW) add_random (RW)
---------------- ----------------
This file allows to trun off the disk entropy contribution. Default This file allows to turn off the disk entropy contribution. Default
value of this file is '1'(on). value of this file is '1'(on).
discard_granularity (RO) discard_granularity (RO)
@ -72,7 +72,7 @@ Maximum segment size of the device.
minimum_io_size (RO) minimum_io_size (RO)
-------------------- --------------------
This is the smallest preferred io size reported by the device. This is the smallest preferred IO size reported by the device.
nomerges (RW) nomerges (RW)
------------- -------------
@ -98,7 +98,7 @@ regulated by nr_requests.
optimal_io_size (RO) optimal_io_size (RO)
-------------------- --------------------
This is the optimal io size reported by the device. This is the optimal IO size reported by the device.
physical_block_size (RO) physical_block_size (RO)
------------------------ ------------------------

2
Documentation/devicetree/bindings/clock/arm-integrator.txt
View file

@ -1,6 +1,6 @@
Clock bindings for ARM Integrator and Versatile Core Module clocks Clock bindings for ARM Integrator and Versatile Core Module clocks
Auxilary Oscillator Clock Auxiliary Oscillator Clock
This is a configurable clock fed from a 24 MHz chrystal, This is a configurable clock fed from a 24 MHz chrystal,
used for generating e.g. video clocks. It is located on the used for generating e.g. video clocks. It is located on the

2
Documentation/devicetree/bindings/crypto/fsl-sec6.txt
View file

@ -1,5 +1,5 @@
SEC 6 is as Freescale's Cryptographic Accelerator and Assurance Module (CAAM). SEC 6 is as Freescale's Cryptographic Accelerator and Assurance Module (CAAM).
Currently Freescale powerpc chip C29X is embeded with SEC 6. Currently Freescale powerpc chip C29X is embedded with SEC 6.
SEC 6 device tree binding include: SEC 6 device tree binding include:
-SEC 6 Node -SEC 6 Node
-Job Ring Node -Job Ring Node

2
Documentation/devicetree/bindings/iio/adc/vf610-adc.txt
View file

@ -9,7 +9,7 @@ Required properties:
- interrupts: Should contain the interrupt for the device - interrupts: Should contain the interrupt for the device
- clocks: The clock is needed by the ADC controller, ADC clock source is ipg clock. - clocks: The clock is needed by the ADC controller, ADC clock source is ipg clock.
- clock-names: Must contain "adc", matching entry in the clocks property. - clock-names: Must contain "adc", matching entry in the clocks property.
- vref-supply: The regulator supply ADC refrence voltage. - vref-supply: The regulator supply ADC reference voltage.
Example: Example:
adc0: adc@4003b000 { adc0: adc@4003b000 {

2
Documentation/devicetree/bindings/mfd/s2mps11.txt
View file

@ -47,7 +47,7 @@ sub-node should be of the format as listed below.
regulator-ramp-delay for BUCKs = [6250/12500/25000(default)/50000] uV/us regulator-ramp-delay for BUCKs = [6250/12500/25000(default)/50000] uV/us
BUCK[2/3/4/6] supports disabling ramp delay on hardware, so explictly BUCK[2/3/4/6] supports disabling ramp delay on hardware, so explicitly
regulator-ramp-delay = <0> can be used for them to disable ramp delay. regulator-ramp-delay = <0> can be used for them to disable ramp delay.
In the absence of the regulator-ramp-delay property, the default ramp In the absence of the regulator-ramp-delay property, the default ramp
delay will be used. delay will be used.

6
Documentation/devicetree/bindings/mtd/gpmc-nand.txt
View file

@ -110,8 +110,8 @@ on various other factors also like;
Other factor which governs the selection of ecc-scheme is oob-size. Other factor which governs the selection of ecc-scheme is oob-size.
Higher ECC schemes require more OOB/Spare area to store ECC syndrome, Higher ECC schemes require more OOB/Spare area to store ECC syndrome,
so the device should have enough free bytes available its OOB/Spare so the device should have enough free bytes available its OOB/Spare
area to accomodate ECC for entire page. In general following expression area to accommodate ECC for entire page. In general following expression
helps in determining if given device can accomodate ECC syndrome: helps in determining if given device can accommodate ECC syndrome:
"2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE" "2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE"
where where
OOBSIZE number of bytes in OOB/spare area OOBSIZE number of bytes in OOB/spare area
@ -133,5 +133,5 @@ on various other factors also like;
Example(b): For a device with PAGESIZE = 2048 and OOBSIZE = 128 and Example(b): For a device with PAGESIZE = 2048 and OOBSIZE = 128 and
trying to use BCH16 (ECC_BYTES=26) ecc-scheme. trying to use BCH16 (ECC_BYTES=26) ecc-scheme.
Number of ECC bytes per page = (2 + (2048 / 512) * 26) = 106 B Number of ECC bytes per page = (2 + (2048 / 512) * 26) = 106 B
which can be accomodate in the OOB/Spare area of this device which can be accommodated in the OOB/Spare area of this device
(OOBSIZE=128). So this device can use BCH16 ecc-scheme. (OOBSIZE=128). So this device can use BCH16 ecc-scheme.

2
Documentation/devicetree/bindings/net/samsung-sxgbe.txt
View file

@ -17,7 +17,7 @@ Required properties:
- samsung,pbl: Integer, Programmable Burst Length. - samsung,pbl: Integer, Programmable Burst Length.
Supported values are 1, 2, 4, 8, 16, or 32. Supported values are 1, 2, 4, 8, 16, or 32.
- samsung,burst-map: Integer, Program the possible bursts supported by sxgbe - samsung,burst-map: Integer, Program the possible bursts supported by sxgbe
This is an interger and represents allowable DMA bursts when fixed burst. This is an integer and represents allowable DMA bursts when fixed burst.
Allowable range is 0x01-0x3F. When this field is set fixed burst is enabled. Allowable range is 0x01-0x3F. When this field is set fixed burst is enabled.
When fixed length is needed for burst mode, it can be set within allowable When fixed length is needed for burst mode, it can be set within allowable
range. range.

2
Documentation/devicetree/bindings/net/stmmac.txt
View file

@ -58,5 +58,5 @@ Examples:
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
snps,perfect-filter-entries = <128>; snps,perfect-filter-entries = <128>;
clocks = <&clock>; clocks = <&clock>;
clock-names = "stmmaceth">; clock-names = "stmmaceth";
}; };

2
Documentation/devicetree/bindings/pci/host-generic-pci.txt
View file

@ -55,7 +55,7 @@ For CAM, this 24-bit offset is:
cfg_offset(bus, device, function, register) = cfg_offset(bus, device, function, register) =
bus << 16 | device << 11 | function << 8 | register bus << 16 | device << 11 | function << 8 | register
Whilst ECAM extends this by 4 bits to accomodate 4k of function space: Whilst ECAM extends this by 4 bits to accommodate 4k of function space:
cfg_offset(bus, device, function, register) = cfg_offset(bus, device, function, register) =
bus << 20 | device << 15 | function << 12 | register bus << 20 | device << 15 | function << 12 | register

2
Documentation/devicetree/bindings/phy/phy-bindings.txt
View file

@ -27,7 +27,7 @@ phys: phy {
}; };
That node describes an IP block (PHY provider) that implements 2 different PHYs. That node describes an IP block (PHY provider) that implements 2 different PHYs.
In order to differentiate between these 2 PHYs, an additonal specifier should be In order to differentiate between these 2 PHYs, an additional specifier should be
given while trying to get a reference to it. given while trying to get a reference to it.
PHY user node PHY user node

2
Documentation/devicetree/bindings/power_supply/charger-manager.txt
View file

@ -24,7 +24,7 @@ Optional properties :
- cm-thermal-zone : name of external thermometer's thermal zone - cm-thermal-zone : name of external thermometer's thermal zone
- cm-battery-* : threshold battery temperature for charging - cm-battery-* : threshold battery temperature for charging
-cold : critical cold temperature of battery for charging -cold : critical cold temperature of battery for charging
-cold-in-minus : flag that cold temerature is in minus degree -cold-in-minus : flag that cold temperature is in minus degrees
-hot : critical hot temperature of battery for charging -hot : critical hot temperature of battery for charging
-temp-diff : temperature difference to allow recharging -temp-diff : temperature difference to allow recharging
- cm-dis/charging-max = limits of charging duration - cm-dis/charging-max = limits of charging duration

2
Documentation/devicetree/bindings/sound/st,sta350.txt
View file

@ -33,7 +33,7 @@ Optional properties:
0: Channel 1 0: Channel 1
1: Channel 2 1: Channel 2
2: Channel 3 2: Channel 3
If parameter is missing, channel 1 is choosen. If parameter is missing, channel 1 is chosen.
This properties have to be specified as '/bits/ 8' values. This properties have to be specified as '/bits/ 8' values.
- st,thermal-warning-recover: - st,thermal-warning-recover:

2
Documentation/devicetree/bindings/vendor-prefixes.txt
View file

@ -140,7 +140,7 @@ tlm Trusted Logic Mobility
toradex Toradex AG toradex Toradex AG
toshiba Toshiba Corporation toshiba Toshiba Corporation
toumaz Toumaz toumaz Toumaz
usi Universal Scientifc Industrial Co., Ltd. usi Universal Scientific Industrial Co., Ltd.
v3 V3 Semiconductor v3 V3 Semiconductor
variscite Variscite Ltd. variscite Variscite Ltd.
via VIA Technologies, Inc. via VIA Technologies, Inc.

4
Documentation/devicetree/bindings/video/atmel,lcdc.txt
View file

@ -39,8 +39,8 @@ Atmel LCDC Display
----------------------------------------------------- -----------------------------------------------------
Required properties (as per of_videomode_helper): Required properties (as per of_videomode_helper):
- atmel,dmacon: dma controler configuration - atmel,dmacon: dma controller configuration
- atmel,lcdcon2: lcd controler configuration - atmel,lcdcon2: lcd controller configuration
- atmel,guard-time: lcd guard time (Delay in frame periods) - atmel,guard-time: lcd guard time (Delay in frame periods)
- bits-per-pixel: lcd panel bit-depth. - bits-per-pixel: lcd panel bit-depth.

2
Documentation/devicetree/bindings/video/fsl,imx-fb.txt
View file

@ -20,7 +20,7 @@ Optional properties:
register is not modified as recommended by the datasheet. register is not modified as recommended by the datasheet.
- fsl,lpccr: Contrast Control Register value. This property provides the - fsl,lpccr: Contrast Control Register value. This property provides the
default value for the contrast control register. default value for the contrast control register.
If that property is ommited, the register is zeroed. If that property is omitted, the register is zeroed.
- fsl,lscr1: LCDC Sharp Configuration Register value. - fsl,lscr1: LCDC Sharp Configuration Register value.
Example: Example:

2
Documentation/kmemleak.txt
View file

@ -122,7 +122,7 @@ Then as usual to get your report with:
Freeing kmemleak internal objects Freeing kmemleak internal objects
--------------------------------- ---------------------------------
To allow access to previosuly found memory leaks after kmemleak has been To allow access to previously found memory leaks after kmemleak has been
disabled by the user or due to an fatal error, internal kmemleak objects disabled by the user or due to an fatal error, internal kmemleak objects
won't be freed when kmemleak is disabled, and those objects may occupy won't be freed when kmemleak is disabled, and those objects may occupy
a large part of physical memory. a large part of physical memory.

2
Documentation/lockup-watchdogs.txt
View file

@ -12,7 +12,7 @@ stack trace is displayed upon detection and, by default, the system
will stay locked up. Alternatively, the kernel can be configured to will stay locked up. Alternatively, the kernel can be configured to
panic; a sysctl, "kernel.softlockup_panic", a kernel parameter, panic; a sysctl, "kernel.softlockup_panic", a kernel parameter,
"softlockup_panic" (see "Documentation/kernel-parameters.txt" for "softlockup_panic" (see "Documentation/kernel-parameters.txt" for
details), and a compile option, "BOOTPARAM_HARDLOCKUP_PANIC", are details), and a compile option, "BOOTPARAM_SOFTLOCKUP_PANIC", are
provided for this. provided for this.
A 'hardlockup' is defined as a bug that causes the CPU to loop in A 'hardlockup' is defined as a bug that causes the CPU to loop in

2
Documentation/mips/AU1xxx_IDE.README
View file

@ -2,7 +2,7 @@ README for MIPS AU1XXX IDE driver - Released 2005-07-15
ABOUT ABOUT
----- -----
This file describes the 'drivers/ide/mips/au1xxx-ide.c', related files and the This file describes the 'drivers/ide/au1xxx-ide.c', related files and the
services they provide. services they provide.
If you are short in patience and just want to know how to add your hard disc to If you are short in patience and just want to know how to add your hard disc to

2
Documentation/serial/serial-rs485.txt
View file

@ -132,5 +132,5 @@
5. REFERENCES 5. REFERENCES
[1] include/linux/serial.h [1] include/uapi/linux/serial.h
[2] Documentation/devicetree/bindings/serial/rs485.txt [2] Documentation/devicetree/bindings/serial/rs485.txt

4
Documentation/serial/tty.txt
View file

@ -146,7 +146,7 @@ set_termios() Notify the tty driver that the device's termios
driver function is responsible for modifying any driver function is responsible for modifying any
bits in the request it cannot fulfill to indicate bits in the request it cannot fulfill to indicate
the actual modes being used. A device with no the actual modes being used. A device with no
hardware capability for change (eg a USB dongle or hardware capability for change (e.g. a USB dongle or
virtual port) can provide NULL for this method. virtual port) can provide NULL for this method.
throttle() Notify the tty driver that input buffers for the throttle() Notify the tty driver that input buffers for the
@ -258,7 +258,7 @@ put_char() - Stuff a single character onto the queue. The
flush_chars() - Ask the kernel to write put_char queue flush_chars() - Ask the kernel to write put_char queue
write_room() - Return the number of characters tht can be stuffed write_room() - Return the number of characters that can be stuffed
into the port buffers without overflow (or less). into the port buffers without overflow (or less).
The ldisc is responsible for being intelligent The ldisc is responsible for being intelligent
about multi-threading of write_room/write calls about multi-threading of write_room/write calls

2
arch/blackfin/Kconfig
View file

@ -671,7 +671,7 @@ config TICKSOURCE_CORETMR
default y default y
endmenu endmenu
menu "Clock souce" menu "Clock source"
depends on GENERIC_CLOCKEVENTS depends on GENERIC_CLOCKEVENTS
config CYCLES_CLOCKSOURCE config CYCLES_CLOCKSOURCE
bool "CYCLES" bool "CYCLES"

2
arch/blackfin/mach-common/ints-priority.c
View file

@ -455,7 +455,7 @@ void handle_sec_sci_fault(uint32_t gstat)
printk(KERN_DEBUG "sec ack err\n"); printk(KERN_DEBUG "sec ack err\n");
break; break;
default: default:
printk(KERN_DEBUG "sec sci unknow err\n"); printk(KERN_DEBUG "sec sci unknown err\n");
} }
} }

2
arch/m68k/Kconfig.devices
View file

@ -73,7 +73,7 @@ config ATARI_ETHERNEC
ROM port. The driver works by polling instead of interrupts, so it ROM port. The driver works by polling instead of interrupts, so it
is quite slow. is quite slow.
This driver also suppports the ethernet part of the NetUSBee ROM This driver also supports the ethernet part of the NetUSBee ROM
port combined Ethernet/USB adapter. port combined Ethernet/USB adapter.
To compile the actual ethernet driver, choose Y or M in for the NE2000 To compile the actual ethernet driver, choose Y or M in for the NE2000

2
arch/mips/cavium-octeon/Kconfig
View file

@ -1,7 +1,7 @@
if CPU_CAVIUM_OCTEON if CPU_CAVIUM_OCTEON
config CAVIUM_CN63XXP1 config CAVIUM_CN63XXP1
bool "Enable CN63XXP1 errata worarounds" bool "Enable CN63XXP1 errata workarounds"
default "n" default "n"
help help
The CN63XXP1 chip requires build time workarounds to The CN63XXP1 chip requires build time workarounds to

2
arch/mips/lantiq/falcon/sysctrl.c
View file

@ -221,7 +221,7 @@ void __init ltq_soc_init(void)
(request_mem_region(res_sys[2].start, (request_mem_region(res_sys[2].start,
resource_size(&res_sys[2]), resource_size(&res_sys[2]),
res_sys[2].name) < 0)) res_sys[2].name) < 0))
pr_err("Failed to request core reources"); pr_err("Failed to request core resources");
status_membase = ioremap_nocache(res_status.start, status_membase = ioremap_nocache(res_status.start,
resource_size(&res_status)); resource_size(&res_status));

2
arch/mips/lantiq/xway/sysctrl.c
View file

@ -318,7 +318,7 @@ void __init ltq_soc_init(void)
res_cgu.name) < 0) || res_cgu.name) < 0) ||
(request_mem_region(res_ebu.start, resource_size(&res_ebu), (request_mem_region(res_ebu.start, resource_size(&res_ebu),
res_ebu.name) < 0)) res_ebu.name) < 0))
pr_err("Failed to request core reources"); pr_err("Failed to request core resources");
pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu)); pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu));
ltq_cgu_membase = ioremap_nocache(res_cgu.start, ltq_cgu_membase = ioremap_nocache(res_cgu.start,

2
arch/mips/pci/pci-lantiq.c
View file

@ -218,7 +218,7 @@ static int ltq_pci_probe(struct platform_device *pdev)
res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0); res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1); res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (!res_cfg || !res_bridge) { if (!res_cfg || !res_bridge) {
dev_err(&pdev->dev, "missing memory reources\n"); dev_err(&pdev->dev, "missing memory resources\n");
return -EINVAL; return -EINVAL;
} }

2
arch/mn10300/Kconfig
View file

@ -181,7 +181,7 @@ endmenu
config SMP config SMP
bool "Symmetric multi-processing support" bool "Symmetric multi-processing support"
default y default y
depends on MN10300_PROC_MN2WS0038 || MN10300_PROC_MN2WS0050 depends on MN10300_PROC_MN2WS0050
---help--- ---help---
This enables support for systems with more than one CPU. If you have This enables support for systems with more than one CPU. If you have
a system with only one CPU, say N. If you have a system with more a system with only one CPU, say N. If you have a system with more

2
arch/powerpc/boot/simpleboot.c
View file

@ -61,7 +61,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
if (*reg++ != 0) if (*reg++ != 0)
fatal("Memory range is not based at address 0\n"); fatal("Memory range is not based at address 0\n");
/* get the memsize and trucate it to under 4G on 32 bit machines */ /* get the memsize and truncate it to under 4G on 32 bit machines */
memsize64 = 0; memsize64 = 0;
for (i = 0; i < *ns; i++) for (i = 0; i < *ns; i++)
memsize64 = (memsize64 << 32) | *reg++; memsize64 = (memsize64 << 32) | *reg++;

2
arch/powerpc/platforms/powernv/opal.c
View file

@ -322,7 +322,7 @@ static void opal_handle_message(void)
/* check for errors. */ /* check for errors. */
if (ret) { if (ret) {
pr_warning("%s: Failed to retrive opal message, err=%lld\n", pr_warning("%s: Failed to retrieve opal message, err=%lld\n",
__func__, ret); __func__, ret);
return; return;
} }

4
arch/powerpc/platforms/pseries/hotplug-memory.c
View file

@ -126,7 +126,7 @@ static int pseries_remove_mem_node(struct device_node *np)
return 0; return 0;
/* /*
* Find the bae address and size of the memblock * Find the base address and size of the memblock
*/ */
regs = of_get_property(np, "reg", NULL); regs = of_get_property(np, "reg", NULL);
if (!regs) if (!regs)
@ -200,7 +200,7 @@ static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
/* The first int of the property is the number of lmb's described /* The first int of the property is the number of lmb's described
* by the property. This is followed by an array of of_drconf_cell * by the property. This is followed by an array of of_drconf_cell
* entries. Get the niumber of entries and skip to the array of * entries. Get the number of entries and skip to the array of
* of_drconf_cell's. * of_drconf_cell's.
*/ */
entries = be32_to_cpu(*p++); entries = be32_to_cpu(*p++);

3
arch/score/Kconfig
View file

@ -22,17 +22,14 @@ choice
config ARCH_SCORE7 config ARCH_SCORE7
bool "SCORE7 processor" bool "SCORE7 processor"
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select GENERIC_HAS_IOMAP
config MACH_SPCT6600 config MACH_SPCT6600
bool "SPCT6600 series based machines" bool "SPCT6600 series based machines"
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select GENERIC_HAS_IOMAP
config SCORE_SIM config SCORE_SIM
bool "Score simulator" bool "Score simulator"
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
select GENERIC_HAS_IOMAP
endchoice endchoice
endmenu endmenu

8
block/blk-core.c
View file

@ -240,7 +240,7 @@ EXPORT_SYMBOL(blk_stop_queue);
* this function. * this function.
* *
* This function does not cancel any asynchronous activity arising * This function does not cancel any asynchronous activity arising
* out of elevator or throttling code. That would require elevaotor_exit() * out of elevator or throttling code. That would require elevator_exit()
* and blkcg_exit_queue() to be called with queue lock initialized. * and blkcg_exit_queue() to be called with queue lock initialized.
* *
*/ */
@ -933,7 +933,7 @@ static struct io_context *rq_ioc(struct bio *bio)
* Get a free request from @q. This function may fail under memory * Get a free request from @q. This function may fail under memory
* pressure or if @q is dead. * pressure or if @q is dead.
* *
* Must be callled with @q->queue_lock held and, * Must be called with @q->queue_lock held and,
* Returns %NULL on failure, with @q->queue_lock held. * Returns %NULL on failure, with @q->queue_lock held.
* Returns !%NULL on success, with @q->queue_lock *not held*. * Returns !%NULL on success, with @q->queue_lock *not held*.
*/ */
@ -1110,7 +1110,7 @@ rq_starved:
* Get a free request from @q. If %__GFP_WAIT is set in @gfp_mask, this * Get a free request from @q. If %__GFP_WAIT is set in @gfp_mask, this
* function keeps retrying under memory pressure and fails iff @q is dead. * function keeps retrying under memory pressure and fails iff @q is dead.
* *
* Must be callled with @q->queue_lock held and, * Must be called with @q->queue_lock held and,
* Returns %NULL on failure, with @q->queue_lock held. * Returns %NULL on failure, with @q->queue_lock held.
* Returns !%NULL on success, with @q->queue_lock *not held*. * Returns !%NULL on success, with @q->queue_lock *not held*.
*/ */
@ -1241,7 +1241,7 @@ struct request *blk_make_request(struct request_queue *q, struct bio *bio,
EXPORT_SYMBOL(blk_make_request); EXPORT_SYMBOL(blk_make_request);
/** /**
* blk_rq_set_block_pc - initialize a requeest to type BLOCK_PC * blk_rq_set_block_pc - initialize a request to type BLOCK_PC
* @rq: request to be initialized * @rq: request to be initialized
* *
*/ */

2
block/genhd.c
View file

@ -1545,7 +1545,7 @@ void disk_flush_events(struct gendisk *disk, unsigned int mask)
/** /**
* disk_clear_events - synchronously check, clear and return pending events * disk_clear_events - synchronously check, clear and return pending events
* @disk: disk to fetch and clear events from * @disk: disk to fetch and clear events from
* @mask: mask of events to be fetched and clearted * @mask: mask of events to be fetched and cleared
* *
* Disk events are synchronously checked and pending events in @mask * Disk events are synchronously checked and pending events in @mask
* are cleared and returned. This ignores the block count. * are cleared and returned. This ignores the block count.

4
drivers/block/paride/pcd.c
View file

@ -69,8 +69,8 @@
nice This parameter controls the driver's use of nice This parameter controls the driver's use of
idle CPU time, at the expense of some speed. idle CPU time, at the expense of some speed.
If this driver is built into the kernel, you can use kernel If this driver is built into the kernel, you can use the
the following command line parameters, with the same values following kernel command line parameters, with the same values
as the corresponding module parameters listed above: as the corresponding module parameters listed above:
pcd.drive0 pcd.drive0

2
drivers/crypto/qat/qat_common/adf_ctl_drv.c
View file

@ -436,7 +436,7 @@ static long adf_ctl_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
ret = adf_ctl_ioctl_get_status(fp, cmd, arg); ret = adf_ctl_ioctl_get_status(fp, cmd, arg);
break; break;
default: default:
pr_err("QAT: Invalid ioclt\n"); pr_err("QAT: Invalid ioctl\n");
ret = -EFAULT; ret = -EFAULT;
break; break;
} }

2
drivers/gpu/drm/i915/intel_bios.c
View file

@ -946,7 +946,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
DRM_DEBUG_KMS("Analog port %c is also DP or TMDS compatible\n", DRM_DEBUG_KMS("Analog port %c is also DP or TMDS compatible\n",
port_name(port)); port_name(port));
if (is_dvi && (port == PORT_A || port == PORT_E)) if (is_dvi && (port == PORT_A || port == PORT_E))
DRM_DEBUG_KMS("Port %c is TMDS compabile\n", port_name(port)); DRM_DEBUG_KMS("Port %c is TMDS compatible\n", port_name(port));
if (!is_dvi && !is_dp && !is_crt) if (!is_dvi && !is_dp && !is_crt)
DRM_DEBUG_KMS("Port %c is not DP/TMDS/CRT compatible\n", DRM_DEBUG_KMS("Port %c is not DP/TMDS/CRT compatible\n",
port_name(port)); port_name(port));

2
drivers/i2c/busses/Kconfig
View file

@ -357,7 +357,7 @@ config I2C_BCM_KONA
If you say yes to this option, support will be included for the If you say yes to this option, support will be included for the
I2C interface on the Broadcom Kona family of processors. I2C interface on the Broadcom Kona family of processors.
If you do not need KONA I2C inteface, say N. If you do not need KONA I2C interface, say N.
config I2C_BLACKFIN_TWI config I2C_BLACKFIN_TWI
tristate "Blackfin TWI I2C support" tristate "Blackfin TWI I2C support"

2
drivers/i2c/busses/i2c-s3c2410.c
View file

@ -244,7 +244,7 @@ static bool is_ack(struct s3c24xx_i2c *i2c)
} }
usleep_range(1000, 2000); usleep_range(1000, 2000);
} }
dev_err(i2c->dev, "ack was not recieved\n"); dev_err(i2c->dev, "ack was not received\n");
return false; return false;
} }

2
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
View file

@ -1870,7 +1870,7 @@ static int ocrdma_build_inline_sges(struct ocrdma_qp *qp,
hdr->total_len = ocrdma_sglist_len(wr->sg_list, wr->num_sge); hdr->total_len = ocrdma_sglist_len(wr->sg_list, wr->num_sge);
if (unlikely(hdr->total_len > qp->max_inline_data)) { if (unlikely(hdr->total_len > qp->max_inline_data)) {
pr_err("%s() supported_len=0x%x,\n" pr_err("%s() supported_len=0x%x,\n"
" unspported len req=0x%x\n", __func__, " unsupported len req=0x%x\n", __func__,
qp->max_inline_data, hdr->total_len); qp->max_inline_data, hdr->total_len);
return -EINVAL; return -EINVAL;
} }

2
drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
View file

@ -511,7 +511,7 @@ int usnic_ib_qp_grp_modify(struct usnic_ib_qp_grp *qp_grp,
usnic_ib_qp_grp_state_to_string(old_state), usnic_ib_qp_grp_state_to_string(old_state),
usnic_ib_qp_grp_state_to_string(new_state)); usnic_ib_qp_grp_state_to_string(new_state));
} else { } else {
usnic_err("Failed to transistion %u from %s to %s", usnic_err("Failed to transition %u from %s to %s",
qp_grp->grp_id, qp_grp->grp_id,
usnic_ib_qp_grp_state_to_string(old_state), usnic_ib_qp_grp_state_to_string(old_state),
usnic_ib_qp_grp_state_to_string(new_state)); usnic_ib_qp_grp_state_to_string(new_state));

2
drivers/irqchip/Kconfig
View file

@ -109,7 +109,7 @@ config XTENSA_MX
config IRQ_CROSSBAR config IRQ_CROSSBAR
bool bool
help help
Support for a CROSSBAR ip that preceeds the main interrupt controller. Support for a CROSSBAR ip that precedes the main interrupt controller.
The primary irqchip invokes the crossbar's callback which inturn allocates The primary irqchip invokes the crossbar's callback which inturn allocates
a free irq and configures the IP. Thus the peripheral interrupts are a free irq and configures the IP. Thus the peripheral interrupts are
routed to one of the free irqchip interrupt lines. routed to one of the free irqchip interrupt lines.

2
drivers/media/i2c/cx25840/cx25840-ir.c
View file

@ -224,7 +224,7 @@ static inline unsigned int lpf_count_to_us(unsigned int count)
} }
/* /*
* FIFO register pulse width count compuations * FIFO register pulse width count computations
*/ */
static u32 clock_divider_to_resolution(u16 divider) static u32 clock_divider_to_resolution(u16 divider)
{ {

2
drivers/media/pci/cx23885/cx23888-ir.c
View file

@ -263,7 +263,7 @@ static inline unsigned int lpf_count_to_us(unsigned int count)
} }
/* /*
* FIFO register pulse width count compuations * FIFO register pulse width count computations
*/ */
static u32 clock_divider_to_resolution(u16 divider) static u32 clock_divider_to_resolution(u16 divider)
{ {

2
drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
View file

@ -259,7 +259,7 @@ static int vv6410_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
fine = val % VV6410_CIF_LINELENGTH; fine = val % VV6410_CIF_LINELENGTH;
coarse = min(512, val / VV6410_CIF_LINELENGTH); coarse = min(512, val / VV6410_CIF_LINELENGTH);
PDEBUG(D_CONF, "Set coarse exposure to %d, fine expsure to %d", PDEBUG(D_CONF, "Set coarse exposure to %d, fine exposure to %d",
coarse, fine); coarse, fine);
err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8); err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8);

4
drivers/misc/mei/pci-me.c
View file

@ -424,7 +424,7 @@ static int mei_me_pm_runtime_resume(struct device *device)
} }
/** /**
* mei_me_set_pm_domain - fill and set pm domian stucture for device * mei_me_set_pm_domain - fill and set pm domain structure for device
* *
* @dev: mei_device * @dev: mei_device
*/ */
@ -444,7 +444,7 @@ static inline void mei_me_set_pm_domain(struct mei_device *dev)
} }
/** /**
* mei_me_unset_pm_domain - clean pm domian stucture for device * mei_me_unset_pm_domain - clean pm domain structure for device
* *
* @dev: mei_device * @dev: mei_device
*/ */

4
drivers/misc/mei/pci-txe.c
View file

@ -371,7 +371,7 @@ static int mei_txe_pm_runtime_resume(struct device *device)
} }
/** /**
* mei_txe_set_pm_domain - fill and set pm domian stucture for device * mei_txe_set_pm_domain - fill and set pm domain structure for device
* *
* @dev: mei_device * @dev: mei_device
*/ */
@ -391,7 +391,7 @@ static inline void mei_txe_set_pm_domain(struct mei_device *dev)
} }
/** /**
* mei_txe_unset_pm_domain - clean pm domian stucture for device * mei_txe_unset_pm_domain - clean pm domain structure for device
* *
* @dev: mei_device * @dev: mei_device
*/ */

2
drivers/net/bonding/bond_sysfs_slave.c
View file

@ -36,7 +36,7 @@ static ssize_t state_show(struct slave *slave, char *buf)
case BOND_STATE_BACKUP: case BOND_STATE_BACKUP:
return sprintf(buf, "backup\n"); return sprintf(buf, "backup\n");
default: default:
return sprintf(buf, "UNKONWN\n"); return sprintf(buf, "UNKNOWN\n");
} }
} }
static SLAVE_ATTR_RO(state); static SLAVE_ATTR_RO(state);

4
drivers/net/ethernet/mellanox/mlx4/cmd.c
View file

@ -1695,7 +1695,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
if (err) { if (err) {
vp_oper->vlan_idx = NO_INDX; vp_oper->vlan_idx = NO_INDX;
mlx4_warn(&priv->dev, mlx4_warn(&priv->dev,
"No vlan resorces slave %d, port %d\n", "No vlan resources slave %d, port %d\n",
slave, port); slave, port);
return err; return err;
} }
@ -1711,7 +1711,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
err = vp_oper->mac_idx; err = vp_oper->mac_idx;
vp_oper->mac_idx = NO_INDX; vp_oper->mac_idx = NO_INDX;
mlx4_warn(&priv->dev, mlx4_warn(&priv->dev,
"No mac resorces slave %d, port %d\n", "No mac resources slave %d, port %d\n",
slave, port); slave, port);
return err; return err;
} }

2
drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
View file

@ -922,7 +922,7 @@ int netxen_config_ipaddr(struct netxen_adapter *adapter, __be32 ip, int cmd)
rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
if (rv != 0) { if (rv != 0) {
printk(KERN_ERR "%s: could not notify %s IP 0x%x reuqest\n", printk(KERN_ERR "%s: could not notify %s IP 0x%x request\n",
adapter->netdev->name, adapter->netdev->name,
(cmd == NX_IP_UP) ? "Add" : "Remove", ip); (cmd == NX_IP_UP) ? "Add" : "Remove", ip);
} }

2
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
View file

@ -941,7 +941,7 @@ void qlcnic_82xx_config_ipaddr(struct qlcnic_adapter *adapter,
rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
if (rv != 0) if (rv != 0)
dev_err(&adapter->netdev->dev, dev_err(&adapter->netdev->dev,
"could not notify %s IP 0x%x reuqest\n", "could not notify %s IP 0x%x request\n",
(cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip); (cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip);
} }

2
drivers/net/ethernet/via/via-velocity.c
View file

@ -2056,7 +2056,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)
struct sk_buff *skb; struct sk_buff *skb;
if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) { if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) {
VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame span multple RDs.\n", vptr->netdev->name); VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame spans multiple RDs.\n", vptr->netdev->name);
stats->rx_length_errors++; stats->rx_length_errors++;
return -EINVAL; return -EINVAL;
} }

2
drivers/net/wireless/libertas/cfg.c
View file

@ -1353,7 +1353,7 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
wait_event_interruptible_timeout(priv->scan_q, wait_event_interruptible_timeout(priv->scan_q,
(priv->scan_req == NULL), (priv->scan_req == NULL),
(15 * HZ)); (15 * HZ));
lbs_deb_assoc("assoc: scanning competed\n"); lbs_deb_assoc("assoc: scanning completed\n");
} }
/* Find the BSS we want using available scan results */ /* Find the BSS we want using available scan results */

2
drivers/net/wireless/libertas_tf/main.c
View file

@ -332,7 +332,7 @@ static int lbtf_op_start(struct ieee80211_hw *hw)
err_prog_firmware: err_prog_firmware:
priv->hw_reset_device(card); priv->hw_reset_device(card);
lbtf_deb_leave_args(LBTF_DEB_MACOPS, "error programing fw; ret=%d", ret); lbtf_deb_leave_args(LBTF_DEB_MACOPS, "error programming fw; ret=%d", ret);
return ret; return ret;
} }

4
drivers/platform/x86/Kconfig
View file

@ -540,7 +540,7 @@ config ASUS_NB_WMI
This is a driver for newer Asus notebooks. It adds extra features This is a driver for newer Asus notebooks. It adds extra features
like wireless radio and bluetooth control, leds, hotkeys, backlight... like wireless radio and bluetooth control, leds, hotkeys, backlight...
For more informations, see For more information, see
<file:Documentation/ABI/testing/sysfs-platform-asus-wmi> <file:Documentation/ABI/testing/sysfs-platform-asus-wmi>
If you have an ACPI-WMI compatible Asus Notebook, say Y or M If you have an ACPI-WMI compatible Asus Notebook, say Y or M
@ -553,7 +553,7 @@ config EEEPC_WMI
This is a driver for newer Eee PC laptops. It adds extra features This is a driver for newer Eee PC laptops. It adds extra features
like wireless radio and bluetooth control, leds, hotkeys, backlight... like wireless radio and bluetooth control, leds, hotkeys, backlight...
For more informations, see For more information, see
<file:Documentation/ABI/testing/sysfs-platform-asus-wmi> <file:Documentation/ABI/testing/sysfs-platform-asus-wmi>
If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M

2
drivers/scsi/aic7xxx/Kconfig.aic79xx
View file

@ -70,7 +70,7 @@ config AIC79XX_DEBUG_MASK
default "0" default "0"
help help
Bit mask of debug options that is only valid if the Bit mask of debug options that is only valid if the
CONFIG_AIC79XX_DEBUG_ENBLE option is enabled. The bits in this mask CONFIG_AIC79XX_DEBUG_ENABLE option is enabled. The bits in this mask
are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the
variable ahd_debug in that file to find them. variable ahd_debug in that file to find them.

2
drivers/scsi/fnic/fnic_debugfs.c
View file

@ -210,7 +210,7 @@ static ssize_t fnic_trace_ctrl_write(struct file *filp,
else if (*trace_type == fc_trc_flag->fc_clear) else if (*trace_type == fc_trc_flag->fc_clear)
fnic_fc_trace_cleared = val; fnic_fc_trace_cleared = val;
else else
pr_err("fnic: cannot write to any debufs file\n"); pr_err("fnic: cannot write to any debugfs file\n");
(*ppos)++; (*ppos)++;

2
drivers/scsi/fnic/fnic_trace.c
View file

@ -592,7 +592,7 @@ int fnic_fc_trace_set_data(u32 host_no, u8 frame_type,
if (fnic_fc_trace_cleared == 1) { if (fnic_fc_trace_cleared == 1) {
fc_trace_entries.rd_idx = fc_trace_entries.wr_idx = 0; fc_trace_entries.rd_idx = fc_trace_entries.wr_idx = 0;
pr_info("fnic: Reseting the read idx\n"); pr_info("fnic: Resetting the read idx\n");
memset((void *)fnic_fc_ctlr_trace_buf_p, 0, memset((void *)fnic_fc_ctlr_trace_buf_p, 0,
fnic_fc_trace_max_pages * PAGE_SIZE); fnic_fc_trace_max_pages * PAGE_SIZE);
fnic_fc_trace_cleared = 0; fnic_fc_trace_cleared = 0;

2
drivers/scsi/nsp32.c
View file

@ -930,7 +930,7 @@ static int nsp32_queuecommand_lck(struct scsi_cmnd *SCpnt, void (*done)(struct s
/* check target ID is not same as this initiator ID */ /* check target ID is not same as this initiator ID */
if (scmd_id(SCpnt) == SCpnt->device->host->this_id) { if (scmd_id(SCpnt) == SCpnt->device->host->this_id) {
nsp32_dbg(NSP32_DEBUG_QUEUECOMMAND, "terget==host???"); nsp32_dbg(NSP32_DEBUG_QUEUECOMMAND, "target==host???");
SCpnt->result = DID_BAD_TARGET << 16; SCpnt->result = DID_BAD_TARGET << 16;
done(SCpnt); done(SCpnt);
return 0; return 0;

2
drivers/scsi/pcmcia/nsp_cs.c
View file

@ -533,7 +533,7 @@ static int nsp_negate_signal(struct scsi_cmnd *SCpnt, unsigned char mask,
} while ((--time_out != 0) && (reg & mask) != 0); } while ((--time_out != 0) && (reg & mask) != 0);
if (time_out == 0) { if (time_out == 0) {
nsp_msg(KERN_DEBUG, " %s signal off timeut", str); nsp_msg(KERN_DEBUG, " %s signal off timeout", str);
} }
return 0; return 0;

2
drivers/scsi/qla2xxx/qla_nx2.c
View file

@ -399,7 +399,7 @@ qla8044_idc_lock(struct qla_hw_data *ha)
*/ */
ql_dbg(ql_dbg_p3p, vha, 0xb08a, ql_dbg(ql_dbg_p3p, vha, 0xb08a,
"%s: IDC lock Recovery by %d " "%s: IDC lock Recovery by %d "
"failed, Retrying timout\n", __func__, "failed, Retrying timeout\n", __func__,
ha->portnum); ha->portnum);
timeout = 0; timeout = 0;
} }

2
drivers/usb/host/Kconfig
View file

@ -126,7 +126,7 @@ config XPS_USB_HCD_XILINX
select USB_EHCI_BIG_ENDIAN_DESC select USB_EHCI_BIG_ENDIAN_DESC
select USB_EHCI_BIG_ENDIAN_MMIO select USB_EHCI_BIG_ENDIAN_MMIO
---help--- ---help---
Xilinx xps USB host controller core is EHCI compilant and has Xilinx xps USB host controller core is EHCI compliant and has
transaction translator built-in. It can be configured to either transaction translator built-in. It can be configured to either
support both high speed and full speed devices, or high speed support both high speed and full speed devices, or high speed
devices only. devices only.

2
drivers/video/backlight/88pm860x_bl.c
View file

@ -216,7 +216,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
data->reg_duty_cycle = res->start; data->reg_duty_cycle = res->start;
res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on"); res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on");
if (!res) { if (!res) {
dev_err(&pdev->dev, "No REG resorce for always on\n"); dev_err(&pdev->dev, "No REG resource for always on\n");
return -ENXIO; return -ENXIO;
} }
data->reg_always_on = res->start; data->reg_always_on = res->start;

3
fs/btrfs/tree-log.c
View file

@ -3994,7 +3994,8 @@ again:
if (ret < 0) { if (ret < 0) {
err = ret; err = ret;
goto out_unlock; goto out_unlock;
} if (ret) { }
if (ret) {
ins_nr = 0; ins_nr = 0;
btrfs_release_path(path); btrfs_release_path(path);
continue; continue;

2
fs/stack.c
View file

@ -44,7 +44,7 @@ void fsstack_copy_inode_size(struct inode *dst, struct inode *src)
* include/linux/fs.h). We don't necessarily hold i_mutex when this * include/linux/fs.h). We don't necessarily hold i_mutex when this
* is called, so take i_lock for that case. * is called, so take i_lock for that case.
* *
* And if CONFIG_LBADF (on 32-bit), continue our effort to keep the * And if CONFIG_LBDAF (on 32-bit), continue our effort to keep the
* two halves of i_blocks in sync despite SMP or PREEMPT: use i_lock * two halves of i_blocks in sync despite SMP or PREEMPT: use i_lock
* for that case too, and do both at once by combining the tests. * for that case too, and do both at once by combining the tests.
* *

2
include/linux/clk.h
View file

@ -238,7 +238,7 @@ void clk_put(struct clk *clk);
/** /**
* devm_clk_put - "free" a managed clock source * devm_clk_put - "free" a managed clock source
* @dev: device used to acuqire the clock * @dev: device used to acquire the clock
* @clk: clock source acquired with devm_clk_get() * @clk: clock source acquired with devm_clk_get()
* *
* Note: drivers must ensure that all clk_enable calls made on this * Note: drivers must ensure that all clk_enable calls made on this

4
include/linux/gpio/driver.h
View file

@ -105,7 +105,7 @@ struct gpio_chip {
#ifdef CONFIG_GPIOLIB_IRQCHIP #ifdef CONFIG_GPIOLIB_IRQCHIP
/* /*
* With CONFIG_GPIO_IRQCHIP we get an irqchip inside the gpiolib * With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib
* to handle IRQs for most practical cases. * to handle IRQs for most practical cases.
*/ */
struct irq_chip *irqchip; struct irq_chip *irqchip;
@ -164,7 +164,7 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
irq_flow_handler_t handler, irq_flow_handler_t handler,
unsigned int type); unsigned int type);
#endif /* CONFIG_GPIO_IRQCHIP */ #endif /* CONFIG_GPIOLIB_IRQCHIP */
int gpiochip_request_own_desc(struct gpio_desc *desc, const char *label); int gpiochip_request_own_desc(struct gpio_desc *desc, const char *label);
void gpiochip_free_own_desc(struct gpio_desc *desc); void gpiochip_free_own_desc(struct gpio_desc *desc);

2
include/linux/kfifo.h
View file

@ -722,7 +722,7 @@ __kfifo_uint_must_check_helper( \
/** /**
* kfifo_dma_out_finish - finish a DMA OUT operation * kfifo_dma_out_finish - finish a DMA OUT operation
* @fifo: address of the fifo to be used * @fifo: address of the fifo to be used
* @len: number of bytes transferrd * @len: number of bytes transferred
* *
* This macro finish a DMA OUT operation. The out counter will be updated by * This macro finish a DMA OUT operation. The out counter will be updated by
* the len parameter. No error checking will be done. * the len parameter. No error checking will be done.

2
include/linux/pagemap.h
View file

@ -96,7 +96,7 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask)
} }
/* /*
* The page cache can done in larger chunks than * The page cache can be done in larger chunks than
* one page, because it allows for more efficient * one page, because it allows for more efficient
* throughput (it can then be mapped into user * throughput (it can then be mapped into user
* space in smaller chunks for same flexibility). * space in smaller chunks for same flexibility).

2
include/linux/percpu-refcount.h
View file

@ -29,7 +29,7 @@
* calls io_destroy() or the process exits. * calls io_destroy() or the process exits.
* *
* In the aio code, kill_ioctx() is called when we wish to destroy a kioctx; it * In the aio code, kill_ioctx() is called when we wish to destroy a kioctx; it
* calls percpu_ref_kill(), then hlist_del_rcu() and sychronize_rcu() to remove * calls percpu_ref_kill(), then hlist_del_rcu() and synchronize_rcu() to remove
* the kioctx from the proccess's list of kioctxs - after that, there can't be * the kioctx from the proccess's list of kioctxs - after that, there can't be
* any new users of the kioctx (from lookup_ioctx()) and it's then safe to drop * any new users of the kioctx (from lookup_ioctx()) and it's then safe to drop
* the initial ref with percpu_ref_put(). * the initial ref with percpu_ref_put().

3
init/do_mounts.c
View file

@ -182,7 +182,8 @@ done:
/* /*
* Convert a name into device number. We accept the following variants: * Convert a name into device number. We accept the following variants:
* *
* 1) device number in hexadecimal represents itself * 1) <hex_major><hex_minor> device number in hexadecimal represents itself
* no leading 0x, for example b302.
* 2) /dev/nfs represents Root_NFS (0xff) * 2) /dev/nfs represents Root_NFS (0xff)
* 3) /dev/<disk_name> represents the device number of disk * 3) /dev/<disk_name> represents the device number of disk
* 4) /dev/<disk_name><decimal> represents the device number * 4) /dev/<disk_name><decimal> represents the device number

6
ipc/util.c
View file

@ -309,7 +309,7 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size)
/** /**
* ipcget_new - create a new ipc object * ipcget_new - create a new ipc object
* @ns: ipc namespace * @ns: ipc namespace
* @ids: ipc identifer set * @ids: ipc identifier set
* @ops: the actual creation routine to call * @ops: the actual creation routine to call
* @params: its parameters * @params: its parameters
* *
@ -363,7 +363,7 @@ static int ipc_check_perms(struct ipc_namespace *ns,
/** /**
* ipcget_public - get an ipc object or create a new one * ipcget_public - get an ipc object or create a new one
* @ns: ipc namespace * @ns: ipc namespace
* @ids: ipc identifer set * @ids: ipc identifier set
* @ops: the actual creation routine to call * @ops: the actual creation routine to call
* @params: its parameters * @params: its parameters
* *
@ -669,7 +669,7 @@ out:
/** /**
* ipcget - Common sys_*get() code * ipcget - Common sys_*get() code
* @ns: namsepace * @ns: namespace
* @ids: ipc identifier set * @ids: ipc identifier set
* @ops: operations to be called on ipc object creation, permission checks * @ops: operations to be called on ipc object creation, permission checks
* and further checks * and further checks

2
kernel/auditsc.c
View file

@ -2406,7 +2406,7 @@ int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
* @new: the new credentials * @new: the new credentials
* @old: the old (current) credentials * @old: the old (current) credentials
* *
* Record the aguments userspace sent to sys_capset for later printing by the * Record the arguments userspace sent to sys_capset for later printing by the
* audit system if applicable * audit system if applicable
*/ */
void __audit_log_capset(const struct cred *new, const struct cred *old) void __audit_log_capset(const struct cred *new, const struct cred *old)

2
kernel/irq/devres.c
View file

@ -38,7 +38,7 @@ static int devm_irq_match(struct device *dev, void *res, void *data)
* *
* Except for the extra @dev argument, this function takes the * Except for the extra @dev argument, this function takes the
* same arguments and performs the same function as * same arguments and performs the same function as
* request_irq(). IRQs requested with this function will be * request_threaded_irq(). IRQs requested with this function will be
* automatically freed on driver detach. * automatically freed on driver detach.
* *
* If an IRQ allocated with this function needs to be freed * If an IRQ allocated with this function needs to be freed

4
lib/bitmap.c
View file

@ -884,7 +884,7 @@ EXPORT_SYMBOL(bitmap_bitremap);
* read it, you're overqualified for your current job.) * read it, you're overqualified for your current job.)
* *
* In other words, @orig is mapped onto (surjectively) @dst, * In other words, @orig is mapped onto (surjectively) @dst,
* using the the map { <n, m> | the n-th bit of @relmap is the * using the map { <n, m> | the n-th bit of @relmap is the
* m-th set bit of @relmap }. * m-th set bit of @relmap }.
* *
* Any set bits in @orig above bit number W, where W is the * Any set bits in @orig above bit number W, where W is the
@ -932,7 +932,7 @@ EXPORT_SYMBOL(bitmap_bitremap);
* *
* Further lets say we use the following code, invoking * Further lets say we use the following code, invoking
* bitmap_fold() then bitmap_onto, as suggested above to * bitmap_fold() then bitmap_onto, as suggested above to
* avoid the possitility of an empty @dst result: * avoid the possibility of an empty @dst result:
* *
* unsigned long *tmp; // a temporary bitmap's bits * unsigned long *tmp; // a temporary bitmap's bits
* *

2
lib/dma-debug.c
View file

@ -1149,7 +1149,7 @@ static void check_unmap(struct dma_debug_entry *ref)
static void check_for_stack(struct device *dev, void *addr) static void check_for_stack(struct device *dev, void *addr)
{ {
if (object_is_on_stack(addr)) if (object_is_on_stack(addr))
err_printk(dev, NULL, "DMA-API: device driver maps memory from" err_printk(dev, NULL, "DMA-API: device driver maps memory from "
"stack [addr=%p]\n", addr); "stack [addr=%p]\n", addr);
} }

2
lib/idr.c
View file

@ -626,7 +626,7 @@ static void __idr_remove_all(struct idr *idp)
* idr_destroy(). * idr_destroy().
* *
* A typical clean-up sequence for objects stored in an idr tree will use * A typical clean-up sequence for objects stored in an idr tree will use
* idr_for_each() to free all objects, if necessay, then idr_destroy() to * idr_for_each() to free all objects, if necessary, then idr_destroy() to
* free up the id mappings and cached idr_layers. * free up the id mappings and cached idr_layers.
*/ */
void idr_destroy(struct idr *idp) void idr_destroy(struct idr *idp)

4
lib/rhashtable.c
View file

@ -54,7 +54,7 @@ static u32 __hashfn(const struct rhashtable *ht, const void *key,
/** /**
* rhashtable_hashfn - compute hash for key of given length * rhashtable_hashfn - compute hash for key of given length
* @ht: hash table to compuate for * @ht: hash table to compute for
* @key: pointer to key * @key: pointer to key
* @len: length of key * @len: length of key
* *
@ -85,7 +85,7 @@ static u32 obj_hashfn(const struct rhashtable *ht, const void *ptr, u32 hsize)
/** /**
* rhashtable_obj_hashfn - compute hash for hashed object * rhashtable_obj_hashfn - compute hash for hashed object
* @ht: hash table to compuate for * @ht: hash table to compute for
* @ptr: pointer to hashed object * @ptr: pointer to hashed object
* *
* Computes the hash value using the hash function `hashfn` respectively * Computes the hash value using the hash function `hashfn` respectively

2
lib/vsprintf.c
View file

@ -1937,7 +1937,7 @@ EXPORT_SYMBOL(sprintf);
* @args: Arguments for the format string * @args: Arguments for the format string
* *
* The format follows C99 vsnprintf, except %n is ignored, and its argument * The format follows C99 vsnprintf, except %n is ignored, and its argument
* is skiped. * is skipped.
* *
* The return value is the number of words(32bits) which would be generated for * The return value is the number of words(32bits) which would be generated for
* the given input. * the given input.

2
mm/filemap.c
View file

@ -727,7 +727,7 @@ EXPORT_SYMBOL_GPL(add_page_wait_queue);
* *
* Unlocks the page and wakes up sleepers in ___wait_on_page_locked(). * Unlocks the page and wakes up sleepers in ___wait_on_page_locked().
* Also wakes sleepers in wait_on_page_writeback() because the wakeup * Also wakes sleepers in wait_on_page_writeback() because the wakeup
* mechananism between PageLocked pages and PageWriteback pages is shared. * mechanism between PageLocked pages and PageWriteback pages is shared.
* But that's OK - sleepers in wait_on_page_writeback() just go back to sleep. * But that's OK - sleepers in wait_on_page_writeback() just go back to sleep.
* *
* The mb is necessary to enforce ordering between the clear_bit and the read * The mb is necessary to enforce ordering between the clear_bit and the read

2
net/mac802154/wpan.c
View file

@ -90,7 +90,7 @@ mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
} }
case SIOCSIFADDR: case SIOCSIFADDR:
dev_warn(&dev->dev, dev_warn(&dev->dev,
"Using DEBUGing ioctl SIOCSIFADDR isn't recommened!\n"); "Using DEBUGing ioctl SIOCSIFADDR isn't recommended!\n");
if (sa->family != AF_IEEE802154 || if (sa->family != AF_IEEE802154 ||
sa->addr.addr_type != IEEE802154_ADDR_SHORT || sa->addr.addr_type != IEEE802154_ADDR_SHORT ||
sa->addr.pan_id == IEEE802154_PANID_BROADCAST || sa->addr.pan_id == IEEE802154_PANID_BROADCAST ||

2
net/netfilter/ipset/ip_set_core.c
View file

@ -478,7 +478,7 @@ ip_set_test(ip_set_id_t index, const struct sk_buff *skb,
if (ret == -EAGAIN) { if (ret == -EAGAIN) {
/* Type requests element to be completed */ /* Type requests element to be completed */
pr_debug("element must be competed, ADD is triggered\n"); pr_debug("element must be completed, ADD is triggered\n");
write_lock_bh(&set->lock); write_lock_bh(&set->lock);
set->variant->kadt(set, skb, par, IPSET_ADD, opt); set->variant->kadt(set, skb, par, IPSET_ADD, opt);
write_unlock_bh(&set->lock); write_unlock_bh(&set->lock);

2
net/rds/af_rds.c
View file

@ -83,7 +83,7 @@ static int rds_release(struct socket *sock)
/* /*
* the binding lookup hash uses rcu, we need to * the binding lookup hash uses rcu, we need to
* make sure we sychronize_rcu before we free our * make sure we synchronize_rcu before we free our
* entry * entry
*/ */
rds_remove_bound(rs); rds_remove_bound(rs);

9
samples/kprobes/jprobe_example.c
View file

@ -24,12 +24,11 @@
/* Proxy routine having the same arguments as actual do_fork() routine */ /* Proxy routine having the same arguments as actual do_fork() routine */
static long jdo_fork(unsigned long clone_flags, unsigned long stack_start, static long jdo_fork(unsigned long clone_flags, unsigned long stack_start,
struct pt_regs *regs, unsigned long stack_size, unsigned long stack_size, int __user *parent_tidptr,
int __user *parent_tidptr, int __user *child_tidptr) int __user *child_tidptr)
{ {
printk(KERN_INFO "jprobe: clone_flags = 0x%lx, stack_size = 0x%lx," pr_info("jprobe: clone_flags = 0x%lx, stack_start = 0x%lx "
" regs = 0x%p\n", "stack_size = 0x%lx\n", clone_flags, stack_start, stack_size);
clone_flags, stack_size, regs);
/* Always end with a call to jprobe_return(). */ /* Always end with a call to jprobe_return(). */
jprobe_return(); jprobe_return();

7
scripts/checkstack.pl
View file

@ -13,7 +13,7 @@
# Random bits by Matt Mackall <mpm@selenic.com> # Random bits by Matt Mackall <mpm@selenic.com>
# M68k port by Geert Uytterhoeven and Andreas Schwab # M68k port by Geert Uytterhoeven and Andreas Schwab
# AVR32 port by Haavard Skinnemoen (Atmel) # AVR32 port by Haavard Skinnemoen (Atmel)
# PARISC port by Kyle McMartin <kyle@parisc-linux.org> # AArch64, PARISC ports by Kyle McMartin
# sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk> # sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk>
# #
# Usage: # Usage:
@ -45,7 +45,10 @@ my (@stack, $re, $dre, $x, $xs, $funcre);
$x = "[0-9a-f]"; # hex character $x = "[0-9a-f]"; # hex character
$xs = "[0-9a-f ]"; # hex character or space $xs = "[0-9a-f ]"; # hex character or space
$funcre = qr/^$x* <(.*)>:$/; $funcre = qr/^$x* <(.*)>:$/;
if ($arch eq 'arm') { if ($arch eq 'aarch64') {
#ffffffc0006325cc: a9bb7bfd stp x29, x30, [sp,#-80]!
$re = qr/^.*stp.*sp,\#-([0-9]{1,8})\]\!/o;
} elsif ($arch eq 'arm') {
#c0008ffc: e24dd064 sub sp, sp, #100 ; 0x64 #c0008ffc: e24dd064 sub sp, sp, #100 ; 0x64
$re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o; $re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o;
} elsif ($arch eq 'avr32') { } elsif ($arch eq 'avr32') {

2
scripts/sign-file
View file

@ -398,7 +398,7 @@ if ($verbose) {
print "Size of signer's name : ", length($signers_name), "\n"; print "Size of signer's name : ", length($signers_name), "\n";
print "Size of key identifier : ", length($key_identifier), "\n"; print "Size of key identifier : ", length($key_identifier), "\n";
print "Size of signature : ", length($signature), "\n"; print "Size of signature : ", length($signature), "\n";
print "Size of informaton : ", length($info), "\n"; print "Size of information : ", length($info), "\n";
print "Size of magic number : ", length($magic_number), "\n"; print "Size of magic number : ", length($magic_number), "\n";
print "Signer's name : '", $signers_name, "'\n"; print "Signer's name : '", $signers_name, "'\n";
print "Digest : $dgst\n"; print "Digest : $dgst\n";

2
security/inode.c
View file

@ -74,7 +74,7 @@ static struct file_system_type fs_type = {
* pointer must be passed to the securityfs_remove() function when the file is * pointer must be passed to the securityfs_remove() function when the file is
* to be removed (no automatic cleanup happens if your module is unloaded, * to be removed (no automatic cleanup happens if your module is unloaded,
* you are responsible here). If an error occurs, the function will return * you are responsible here). If an error occurs, the function will return
* the erorr value (via ERR_PTR). * the error value (via ERR_PTR).
* *
* If securityfs is not enabled in the kernel, the value %-ENODEV is * If securityfs is not enabled in the kernel, the value %-ENODEV is
* returned. * returned.