kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Pull trivial branch from Jiri Kosina:
 "Usual stuff -- comment/printk typo fixes, documentation updates, dead
  code elimination."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  HOWTO: fix double words typo
  x86 mtrr: fix comment typo in mtrr_bp_init
  propagate name change to comments in kernel source
  doc: Update the name of profiling based on sysfs
  treewide: Fix typos in various drivers
  treewide: Fix typos in various Kconfig
  wireless: mwifiex: Fix typo in wireless/mwifiex driver
  messages: i2o: Fix typo in messages/i2o
  scripts/kernel-doc: check that non-void fcts describe their return value
  Kernel-doc: Convention: Use a "Return" section to describe return values
  radeon: Fix typo and copy/paste error in comments
  doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
  various: Fix spelling of "asynchronous" in comments.
  Fix misspellings of "whether" in comments.
  eisa: Fix spelling of "asynchronous".
  various: Fix spelling of "registered" in comments.
  doc: fix quite a few typos within Documentation
  target: iscsi: fix comment typos in target/iscsi drivers
  treewide: fix typo of "suport" in various comments and Kconfig
  treewide: fix typo of "suppport" in various comments
  ...
This commit is contained in:
Linus Torvalds 2012-12-13 12:00:02 -08:00
commit a2013a13e6
181 changed files with 273 additions and 240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/ABI/testing/dev-kmsg
View file

@ -92,7 +92,7 @@ Description: The /dev/kmsg character device node provides userspace access
The flags field carries '-' by default. A 'c' indicates a The flags field carries '-' by default. A 'c' indicates a
fragment of a line. All following fragments are flagged with fragment of a line. All following fragments are flagged with
'+'. Note, that these hints about continuation lines are not '+'. Note, that these hints about continuation lines are not
neccessarily correct, and the stream could be interleaved with necessarily correct, and the stream could be interleaved with
unrelated messages, but merging the lines in the output unrelated messages, but merging the lines in the output
usually produces better human readable results. A similar usually produces better human readable results. A similar
logic is used internally when messages are printed to the logic is used internally when messages are printed to the

2
Documentation/ABI/testing/sysfs-devices-power
View file

@ -164,7 +164,7 @@ Contact: Rafael J. Wysocki <rjw@sisk.pl>
Description: Description:
The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
contains the total time the device has been preventing contains the total time the device has been preventing
opportunistic transitions to sleep states from occuring. opportunistic transitions to sleep states from occurring.
This attribute is read-only. If the device is not enabled to This attribute is read-only. If the device is not enabled to
wake up the system from sleep states, this attribute is not wake up the system from sleep states, this attribute is not
present. present.

2
Documentation/ABI/testing/sysfs-driver-ppi
View file

@ -5,7 +5,7 @@ Contact: xiaoyan.zhang@intel.com
Description: Description:
This folder includes the attributes related with PPI (Physical This folder includes the attributes related with PPI (Physical
Presence Interface). Only if TPM is supported by BIOS, this Presence Interface). Only if TPM is supported by BIOS, this
folder makes sence. The folder path can be got by command folder makes sense. The folder path can be got by command
'find /sys/ -name 'pcrs''. For the detail information of PPI, 'find /sys/ -name 'pcrs''. For the detail information of PPI,
please refer to the PPI specification from please refer to the PPI specification from
http://www.trustedcomputinggroup.org/ http://www.trustedcomputinggroup.org/

6
Documentation/ABI/testing/sysfs-profiling
View file

@ -1,13 +1,13 @@
What: /sys/kernel/profile What: /sys/kernel/profiling
Date: September 2008 Date: September 2008
Contact: Dave Hansen <dave@linux.vnet.ibm.com> Contact: Dave Hansen <dave@linux.vnet.ibm.com>
Description: Description:
/sys/kernel/profile is the runtime equivalent /sys/kernel/profiling is the runtime equivalent
of the boot-time profile= option. of the boot-time profile= option.
You can get the same effect running: You can get the same effect running:
echo 2 > /sys/kernel/profile echo 2 > /sys/kernel/profiling
as you would by issuing profile=2 on the boot as you would by issuing profile=2 on the boot
command line. command line.

2
Documentation/HOWTO
View file

@ -462,7 +462,7 @@ Differences between the kernel community and corporate structures
The kernel community works differently than most traditional corporate The kernel community works differently than most traditional corporate
development environments. Here are a list of things that you can try to development environments. Here are a list of things that you can try to
do to try to avoid problems: do to avoid problems:
Good things to say regarding your proposed changes: Good things to say regarding your proposed changes:
- "This solves multiple problems." - "This solves multiple problems."
- "This deletes 2000 lines of code." - "This deletes 2000 lines of code."

1
Documentation/accounting/getdelays.c
View file

@ -51,7 +51,6 @@ int dbg;
int print_delays; int print_delays;
int print_io_accounting; int print_io_accounting;
int print_task_context_switch_counts; int print_task_context_switch_counts;
__u64 stime, utime;
#define PRINTF(fmt, arg...) { \ #define PRINTF(fmt, arg...) { \
if (dbg) { \ if (dbg) { \

4
Documentation/dma-buf-sharing.txt
View file

@ -376,7 +376,7 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases:
leaving the cpu domain and flushing caches at fault time. Note that all the leaving the cpu domain and flushing caches at fault time. Note that all the
dma_buf files share the same anon inode, hence the exporter needs to replace dma_buf files share the same anon inode, hence the exporter needs to replace
the dma_buf file stored in vma->vm_file with it's own if pte shootdown is the dma_buf file stored in vma->vm_file with it's own if pte shootdown is
requred. This is because the kernel uses the underlying inode's address_space required. This is because the kernel uses the underlying inode's address_space
for vma tracking (and hence pte tracking at shootdown time with for vma tracking (and hence pte tracking at shootdown time with
unmap_mapping_range). unmap_mapping_range).
@ -388,7 +388,7 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases:
Exporters that shoot down mappings (for any reasons) shall not do any Exporters that shoot down mappings (for any reasons) shall not do any
synchronization at fault time with outstanding device operations. synchronization at fault time with outstanding device operations.
Synchronization is an orthogonal issue to sharing the backing storage of a Synchronization is an orthogonal issue to sharing the backing storage of a
buffer and hence should not be handled by dma-buf itself. This is explictly buffer and hence should not be handled by dma-buf itself. This is explicitly
mentioned here because many people seem to want something like this, but if mentioned here because many people seem to want something like this, but if
different exporters handle this differently, buffer sharing can fail in different exporters handle this differently, buffer sharing can fail in
interesting ways depending upong the exporter (if userspace starts depending interesting ways depending upong the exporter (if userspace starts depending

1
Documentation/dontdiff
View file

@ -181,7 +181,6 @@ modversions.h*
nconf nconf
ncscope.* ncscope.*
offset.h offset.h
offsets.h
oui.c* oui.c*
page-types page-types
parse.c parse.c

4
Documentation/fault-injection/notifier-error-inject.txt
View file

@ -1,7 +1,7 @@
Notifier error injection Notifier error injection
======================== ========================
Notifier error injection provides the ability to inject artifical errors to Notifier error injection provides the ability to inject artificial errors to
specified notifier chain callbacks. It is useful to test the error handling of specified notifier chain callbacks. It is useful to test the error handling of
notifier call chain failures which is rarely executed. There are kernel notifier call chain failures which is rarely executed. There are kernel
modules that can be used to test the following notifiers. modules that can be used to test the following notifiers.
@ -14,7 +14,7 @@ modules that can be used to test the following notifiers.
CPU notifier error injection module CPU notifier error injection module
----------------------------------- -----------------------------------
This feature can be used to test the error handling of the CPU notifiers by This feature can be used to test the error handling of the CPU notifiers by
injecting artifical errors to CPU notifier chain callbacks. injecting artificial errors to CPU notifier chain callbacks.
If the notifier call chain should be failed with some events notified, write If the notifier call chain should be failed with some events notified, write
the error code to debugfs interface the error code to debugfs interface

2
Documentation/hid/uhid.txt
View file

@ -108,7 +108,7 @@ the request was handled successfully.
UHID_FEATURE_ANSWER: UHID_FEATURE_ANSWER:
If you receive a UHID_FEATURE request you must answer with this request. You If you receive a UHID_FEATURE request you must answer with this request. You
must copy the "id" field from the request into the answer. Set the "err" field must copy the "id" field from the request into the answer. Set the "err" field
to 0 if no error occured or to EIO if an I/O error occurred. to 0 if no error occurred or to EIO if an I/O error occurred.
If "err" is 0 then you should fill the buffer of the answer with the results If "err" is 0 then you should fill the buffer of the answer with the results
of the feature request and set "size" correspondingly. of the feature request and set "size" correspondingly.

2
Documentation/hwmon/pmbus
View file

@ -138,7 +138,7 @@ Sysfs entries
When probing the chip, the driver identifies which PMBus registers are When probing the chip, the driver identifies which PMBus registers are
supported, and determines available sensors from this information. supported, and determines available sensors from this information.
Attribute files only exist if respective sensors are suported by the chip. Attribute files only exist if respective sensors are supported by the chip.
Labels are provided to inform the user about the sensor associated with Labels are provided to inform the user about the sensor associated with
a given sysfs entry. a given sysfs entry.

2
Documentation/input/alps.txt
View file

@ -133,7 +133,7 @@ number of contacts (f1 and f0 in the table below).
This packet only appears after a position packet with the mt bit set, and This packet only appears after a position packet with the mt bit set, and
usually only appears when there are two or more contacts (although usually only appears when there are two or more contacts (although
occassionally it's seen with only a single contact). occasionally it's seen with only a single contact).
The final v3 packet type is the trackstick packet. The final v3 packet type is the trackstick packet.

2
Documentation/kbuild/modules.txt
View file

@ -470,7 +470,7 @@ build.
Sometimes, an external module uses exported symbols from Sometimes, an external module uses exported symbols from
another external module. kbuild needs to have full knowledge of another external module. kbuild needs to have full knowledge of
all symbols to avoid spitting out warnings about undefined all symbols to avoid spliitting out warnings about undefined
symbols. Three solutions exist for this situation. symbols. Three solutions exist for this situation.
NOTE: The method with a top-level kbuild file is recommended NOTE: The method with a top-level kbuild file is recommended

13
Documentation/kernel-doc-nano-HOWTO.txt
View file

@ -64,6 +64,8 @@ Example kernel-doc function comment:
* comment lines. * comment lines.
* *
* The longer description can have multiple paragraphs. * The longer description can have multiple paragraphs.
*
* Return: Describe the return value of foobar.
*/ */
The short description following the subject can span multiple lines The short description following the subject can span multiple lines
@ -78,6 +80,8 @@ If a function parameter is "..." (varargs), it should be listed in
kernel-doc notation as: kernel-doc notation as:
* @...: description * @...: description
The return value, if any, should be described in a dedicated section
named "Return".
Example kernel-doc data structure comment. Example kernel-doc data structure comment.
@ -222,6 +226,9 @@ only a "*").
"section header:" names must be unique per function (or struct, "section header:" names must be unique per function (or struct,
union, typedef, enum). union, typedef, enum).
Use the section header "Return" for sections describing the return value
of a function.
Avoid putting a spurious blank line after the function name, or else the Avoid putting a spurious blank line after the function name, or else the
description will be repeated! description will be repeated!
@ -237,21 +244,21 @@ patterns, which are highlighted appropriately.
NOTE 1: The multi-line descriptive text you provide does *not* recognize NOTE 1: The multi-line descriptive text you provide does *not* recognize
line breaks, so if you try to format some text nicely, as in: line breaks, so if you try to format some text nicely, as in:
Return codes Return:
0 - cool 0 - cool
1 - invalid arg 1 - invalid arg
2 - out of memory 2 - out of memory
this will all run together and produce: this will all run together and produce:
Return codes 0 - cool 1 - invalid arg 2 - out of memory Return: 0 - cool 1 - invalid arg 2 - out of memory
NOTE 2: If the descriptive text you provide has lines that begin with NOTE 2: If the descriptive text you provide has lines that begin with
some phrase followed by a colon, each of those phrases will be taken as some phrase followed by a colon, each of those phrases will be taken as
a new section heading, which means you should similarly try to avoid text a new section heading, which means you should similarly try to avoid text
like: like:
Return codes: Return:
0: cool 0: cool
1: invalid arg 1: invalid arg
2: out of memory 2: out of memory

4
Documentation/misc-devices/mei/mei-amt-version.c
View file

@ -214,7 +214,7 @@ out:
} }
/*************************************************************************** /***************************************************************************
* Intel Advanced Management Technolgy ME Client * Intel Advanced Management Technology ME Client
***************************************************************************/ ***************************************************************************/
#define AMT_MAJOR_VERSION 1 #define AMT_MAJOR_VERSION 1
@ -256,7 +256,7 @@ struct amt_code_versions {
} __attribute__((packed)); } __attribute__((packed));
/*************************************************************************** /***************************************************************************
* Intel Advanced Management Technolgy Host Interface * Intel Advanced Management Technology Host Interface
***************************************************************************/ ***************************************************************************/
struct amt_host_if_msg_header { struct amt_host_if_msg_header {

2
Documentation/video4linux/bttv/Cards
View file

@ -43,7 +43,7 @@ Very nice card if you only have satellite TV but several tuners connected
to the card via composite. to the card via composite.
Many thanks to Matrix-Vision for giving us 2 cards for free which made Many thanks to Matrix-Vision for giving us 2 cards for free which made
Bt848a/Bt849 single crytal operation support possible!!! Bt848a/Bt849 single crystal operation support possible!!!

2
Documentation/video4linux/bttv/Sound-FAQ
View file

@ -82,7 +82,7 @@ card installed, you might to check out if you can read these registers
values used by the windows driver. A tool to do this is available values used by the windows driver. A tool to do this is available
from ftp://telepresence.dmem.strath.ac.uk/pub/bt848/winutil, but it from ftp://telepresence.dmem.strath.ac.uk/pub/bt848/winutil, but it
does'nt work with bt878 boards according to some reports I received. does'nt work with bt878 boards according to some reports I received.
Another one with bt878 suport is available from Another one with bt878 support is available from
http://btwincap.sourceforge.net/Files/btspy2.00.zip http://btwincap.sourceforge.net/Files/btspy2.00.zip
You might also dig around in the *.ini files of the Windows applications. You might also dig around in the *.ini files of the Windows applications.

2
Documentation/vm/frontswap.txt
View file

@ -193,7 +193,7 @@ faster.
or maybe swap-over-nbd/NFS)? or maybe swap-over-nbd/NFS)?
No. First, the existing swap subsystem doesn't allow for any kind of No. First, the existing swap subsystem doesn't allow for any kind of
swap hierarchy. Perhaps it could be rewritten to accomodate a hierarchy, swap hierarchy. Perhaps it could be rewritten to accommodate a hierarchy,
but this would require fairly drastic changes. Even if it were but this would require fairly drastic changes. Even if it were
rewritten, the existing swap subsystem uses the block I/O layer which rewritten, the existing swap subsystem uses the block I/O layer which
assumes a swap device is fixed size and any page in it is linearly assumes a swap device is fixed size and any page in it is linearly

2
MAINTAINERS
View file

@ -3596,7 +3596,7 @@ S: Maintained
F: drivers/input/touchscreen/htcpen.c F: drivers/input/touchscreen/htcpen.c
HUGETLB FILESYSTEM HUGETLB FILESYSTEM
M: William Irwin <wli@holomorphy.com> M: Nadia Yvette Chambers <nyc@holomorphy.com>
S: Maintained S: Maintained
F: fs/hugetlbfs/ F: fs/hugetlbfs/

4
README
View file

@ -180,6 +180,10 @@ CONFIGURING the kernel:
with questions already answered. with questions already answered.
Additionally updates the dependencies. Additionally updates the dependencies.
"make olddefconfig"
Like above, but sets new symbols to their default
values without prompting.
"make defconfig" Create a ./.config file by using the default "make defconfig" Create a ./.config file by using the default
symbol values from either arch/$ARCH/defconfig symbol values from either arch/$ARCH/defconfig
or arch/$ARCH/configs/${PLATFORM}_defconfig, or arch/$ARCH/configs/${PLATFORM}_defconfig,

2
arch/alpha/include/asm/mmzone.h
View file

@ -66,7 +66,7 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n)
((unsigned long)__va(NODE_DATA(kvaddr_to_nid(kaddr))->node_start_pfn \ ((unsigned long)__va(NODE_DATA(kvaddr_to_nid(kaddr))->node_start_pfn \
<< PAGE_SHIFT)) << PAGE_SHIFT))
/* XXX: FIXME -- wli */ /* XXX: FIXME -- nyc */
#define kern_addr_valid(kaddr) (0) #define kern_addr_valid(kaddr) (0)
#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)

12
arch/alpha/kernel/pci_iommu.c
View file

@ -354,8 +354,7 @@ static dma_addr_t alpha_pci_map_page(struct device *dev, struct page *page,
struct pci_dev *pdev = alpha_gendev_to_pci(dev); struct pci_dev *pdev = alpha_gendev_to_pci(dev);
int dac_allowed; int dac_allowed;
if (dir == PCI_DMA_NONE) BUG_ON(dir == PCI_DMA_NONE);
BUG();
dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
return pci_map_single_1(pdev, (char *)page_address(page) + offset, return pci_map_single_1(pdev, (char *)page_address(page) + offset,
@ -378,8 +377,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr,
struct pci_iommu_arena *arena; struct pci_iommu_arena *arena;
long dma_ofs, npages; long dma_ofs, npages;
if (dir == PCI_DMA_NONE) BUG_ON(dir == PCI_DMA_NONE);
BUG();
if (dma_addr >= __direct_map_base if (dma_addr >= __direct_map_base
&& dma_addr < __direct_map_base + __direct_map_size) { && dma_addr < __direct_map_base + __direct_map_size) {
@ -662,8 +660,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg,
dma_addr_t max_dma; dma_addr_t max_dma;
int dac_allowed; int dac_allowed;
if (dir == PCI_DMA_NONE) BUG_ON(dir == PCI_DMA_NONE);
BUG();
dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0;
@ -742,8 +739,7 @@ static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg,
dma_addr_t max_dma; dma_addr_t max_dma;
dma_addr_t fbeg, fend; dma_addr_t fbeg, fend;
if (dir == PCI_DMA_NONE) BUG_ON(dir == PCI_DMA_NONE);
BUG();
if (! alpha_mv.mv_pci_tbi) if (! alpha_mv.mv_pci_tbi)
return; return;

2
arch/arm/kernel/kprobes-test.c
View file

@ -1598,7 +1598,7 @@ static int __init run_all_tests(void)
{ {
int ret = 0; int ret = 0;
pr_info("Begining kprobe tests...\n"); pr_info("Beginning kprobe tests...\n");
#ifndef CONFIG_THUMB2_KERNEL #ifndef CONFIG_THUMB2_KERNEL

2
arch/arm/mach-netx/xc.c
View file

@ -136,7 +136,7 @@ int xc_request_firmware(struct xc *x)
if (head->magic != 0x4e657458) { if (head->magic != 0x4e657458) {
if (head->magic == 0x5874654e) { if (head->magic == 0x5874654e) {
dev_err(x->dev, dev_err(x->dev,
"firmware magic is 'XteN'. Endianess problems?\n"); "firmware magic is 'XteN'. Endianness problems?\n");
ret = -ENODEV; ret = -ENODEV;
goto exit_release_firmware; goto exit_release_firmware;
} }

2
arch/arm/mach-s3c24xx/include/mach/bast-map.h
View file

@ -74,7 +74,7 @@
/* 0xE0000000 contains the IO space that is split by speed and /* 0xE0000000 contains the IO space that is split by speed and
* wether the access is for 8 or 16bit IO... this ensures that * whether the access is for 8 or 16bit IO... this ensures that
* the correct access is made * the correct access is made
* *
* 0x10000000 of space, partitioned as so: * 0x10000000 of space, partitioned as so:

2
arch/arm/mach-s3c24xx/include/mach/dma.h
View file

@ -88,7 +88,7 @@ enum s3c2410_dma_state {
* *
* This represents the state of the DMA engine, wrt to the loaded / running * This represents the state of the DMA engine, wrt to the loaded / running
* transfers. Since we don't have any way of knowing exactly the state of * transfers. Since we don't have any way of knowing exactly the state of
* the DMA transfers, we need to know the state to make decisions on wether * the DMA transfers, we need to know the state to make decisions on whether
* we can * we can
* *
* S3C2410_DMA_NONE * S3C2410_DMA_NONE

2
arch/arm/mach-s3c24xx/include/mach/vr1000-map.h
View file

@ -51,7 +51,7 @@
#define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000) #define VR1000_VA_PC104_IRQMASK VR1000_IOADDR(0x00600000)
/* 0xE0000000 contains the IO space that is split by speed and /* 0xE0000000 contains the IO space that is split by speed and
* wether the access is for 8 or 16bit IO... this ensures that * whether the access is for 8 or 16bit IO... this ensures that
* the correct access is made * the correct access is made
* *
* 0x10000000 of space, partitioned as so: * 0x10000000 of space, partitioned as so:

2
arch/arm/mach-s3c24xx/pm.c
View file

@ -121,7 +121,7 @@ void s3c_pm_configure_extint(void)
int pin; int pin;
/* for each of the external interrupts (EINT0..EINT15) we /* for each of the external interrupts (EINT0..EINT15) we
* need to check wether it is an external interrupt source, * need to check whether it is an external interrupt source,
* and then configure it as an input if it is not * and then configure it as an input if it is not
*/ */

2
arch/arm/mach-tegra/Kconfig
View file

@ -55,7 +55,7 @@ config TEGRA_AHB
help help
Adds AHB configuration functionality for NVIDIA Tegra SoCs, Adds AHB configuration functionality for NVIDIA Tegra SoCs,
which controls AHB bus master arbitration and some which controls AHB bus master arbitration and some
perfomance parameters(priority, prefech size). performance parameters(priority, prefech size).
config TEGRA_EMC_SCALING_ENABLE config TEGRA_EMC_SCALING_ENABLE
bool "Enable scaling the memory frequency" bool "Enable scaling the memory frequency"

2
arch/arm/plat-s3c24xx/dma.c
View file

@ -325,7 +325,7 @@ static int s3c2410_dma_start(struct s3c2410_dma_chan *chan)
chan->state = S3C2410_DMA_RUNNING; chan->state = S3C2410_DMA_RUNNING;
/* check wether there is anything to load, and if not, see /* check whether there is anything to load, and if not, see
* if we can find anything to load * if we can find anything to load
*/ */

2
arch/blackfin/mach-bf609/Kconfig
View file

@ -56,7 +56,7 @@ config SEC_IRQ_PRIORITY_LEVELS
default 7 default 7
range 0 7 range 0 7
help help
Devide the total number of interrupt priority levels into sub-levels. Divide the total number of interrupt priority levels into sub-levels.
There is 2 ^ (SEC_IRQ_PRIORITY_LEVELS + 1) different levels. There is 2 ^ (SEC_IRQ_PRIORITY_LEVELS + 1) different levels.
endmenu endmenu

2
arch/blackfin/mm/sram-alloc.c
View file

@ -191,7 +191,7 @@ static irqreturn_t l2_ecc_err(int irq, void *dev_id)
{ {
int status; int status;
printk(KERN_ERR "L2 ecc error happend\n"); printk(KERN_ERR "L2 ecc error happened\n");
status = bfin_read32(L2CTL0_STAT); status = bfin_read32(L2CTL0_STAT);
if (status & 0x1) if (status & 0x1)
printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n", printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n",

2
arch/cris/include/arch-v10/arch/irq.h
View file

@ -142,7 +142,7 @@ __asm__ ( \
* it here, we would not get the multiple_irq at all. * it here, we would not get the multiple_irq at all.
* *
* The non-blocking here is based on the knowledge that the timer interrupt is * The non-blocking here is based on the knowledge that the timer interrupt is
* registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not * registered as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not
* be an sti() before the timer irq handler is run to acknowledge the interrupt. * be an sti() before the timer irq handler is run to acknowledge the interrupt.
*/ */

2
arch/cris/include/arch-v32/arch/irq.h
View file

@ -103,7 +103,7 @@ __asm__ ( \
* if we had BLOCK'edit here, we would not get the multiple_irq at all. * if we had BLOCK'edit here, we would not get the multiple_irq at all.
* *
* The non-blocking here is based on the knowledge that the timer interrupt is * The non-blocking here is based on the knowledge that the timer interrupt is
* registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not * registered as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not
* be an sti() before the timer irq handler is run to acknowledge the interrupt. * be an sti() before the timer irq handler is run to acknowledge the interrupt.
*/ */
#define BUILD_TIMER_IRQ(nr, mask) \ #define BUILD_TIMER_IRQ(nr, mask) \

2
arch/frv/mm/pgalloc.c
View file

@ -77,7 +77,7 @@ void __set_pmd(pmd_t *pmdptr, unsigned long pmd)
* checks at dup_mmap(), exec(), and other mmlist addition points * checks at dup_mmap(), exec(), and other mmlist addition points
* could be used. The locking scheme was chosen on the basis of * could be used. The locking scheme was chosen on the basis of
* manfred's recommendations and having no core impact whatsoever. * manfred's recommendations and having no core impact whatsoever.
* -- wli * -- nyc
*/ */
DEFINE_SPINLOCK(pgd_lock); DEFINE_SPINLOCK(pgd_lock);
struct page *pgd_list; struct page *pgd_list;

2
arch/ia64/kvm/kvm-ia64.c
View file

@ -1,5 +1,5 @@
/* /*
* kvm_ia64.c: Basic KVM suppport On Itanium series processors * kvm_ia64.c: Basic KVM support On Itanium series processors
* *
* *
* Copyright (C) 2007, Intel Corporation. * Copyright (C) 2007, Intel Corporation.

2
arch/m68k/math-emu/fp_log.c
View file

@ -50,7 +50,7 @@ fp_fsqrt(struct fp_ext *dest, struct fp_ext *src)
* sqrt(m*2^e) = * sqrt(m*2^e) =
* sqrt(2*m) * 2^(p) , if e = 2*p + 1 * sqrt(2*m) * 2^(p) , if e = 2*p + 1
* *
* So we use the last bit of the exponent to decide wether to * So we use the last bit of the exponent to decide whether to
* use the m or 2*m. * use the m or 2*m.
* *
* Since only the fractional part of the mantissa is stored and * Since only the fractional part of the mantissa is stored and

2
arch/mips/txx9/generic/pci.c
View file

@ -341,7 +341,7 @@ static void __devinit quirk_slc90e66_ide(struct pci_dev *dev)
static void __devinit tc35815_fixup(struct pci_dev *dev) static void __devinit tc35815_fixup(struct pci_dev *dev)
{ {
/* This device may have PM registers but not they are not suported. */ /* This device may have PM registers but not they are not supported. */
if (dev->pm_cap) { if (dev->pm_cap) {
dev_info(&dev->dev, "PM disabled\n"); dev_info(&dev->dev, "PM disabled\n");
dev->pm_cap = 0; dev->pm_cap = 0;

2
arch/mn10300/mm/pgtable.c
View file

@ -95,7 +95,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
* checks at dup_mmap(), exec(), and other mmlist addition points * checks at dup_mmap(), exec(), and other mmlist addition points
* could be used. The locking scheme was chosen on the basis of * could be used. The locking scheme was chosen on the basis of
* manfred's recommendations and having no core impact whatsoever. * manfred's recommendations and having no core impact whatsoever.
* -- wli * -- nyc
*/ */
DEFINE_SPINLOCK(pgd_lock); DEFINE_SPINLOCK(pgd_lock);
struct page *pgd_list; struct page *pgd_list;

2
arch/openrisc/Kconfig
View file

@ -146,7 +146,7 @@ config DEBUG_STACKOVERFLOW
help help
Make extra checks for space available on stack in some Make extra checks for space available on stack in some
critical functions. This will cause kernel to run a bit slower, critical functions. This will cause kernel to run a bit slower,
but will catch most of kernel stack overruns and exit gracefuly. but will catch most of kernel stack overruns and exit gracefully.
Say Y if you are unsure. Say Y if you are unsure.

2
arch/powerpc/include/asm/oprofile_impl.h
View file

@ -34,7 +34,7 @@ struct op_system_config {
unsigned long mmcra; unsigned long mmcra;
#ifdef CONFIG_OPROFILE_CELL #ifdef CONFIG_OPROFILE_CELL
/* Register for oprofile user tool to check cell kernel profiling /* Register for oprofile user tool to check cell kernel profiling
* suport. * support.
*/ */
unsigned long cell_support; unsigned long cell_support;
#endif #endif

2
arch/powerpc/include/asm/pte-hash64-64k.h
View file

@ -23,7 +23,7 @@
/* Note the full page bits must be in the same location as for normal /* Note the full page bits must be in the same location as for normal
* 4k pages as the same assembly will be used to insert 64K pages * 4k pages as the same assembly will be used to insert 64K pages
* wether the kernel has CONFIG_PPC_64K_PAGES or not * whether the kernel has CONFIG_PPC_64K_PAGES or not
*/ */
#define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */ #define _PAGE_F_SECOND 0x00008000 /* full page: hidx bits */
#define _PAGE_F_GIX 0x00007000 /* full page: hidx bits */ #define _PAGE_F_GIX 0x00007000 /* full page: hidx bits */

4
arch/powerpc/include/asm/smu.h
View file

@ -132,7 +132,7 @@
* *
* At this point, the OF driver seems to have a limitation on transfer * At this point, the OF driver seems to have a limitation on transfer
* sizes of 0xd bytes on reads and 0x5 bytes on writes. I do not know * sizes of 0xd bytes on reads and 0x5 bytes on writes. I do not know
* wether this is just an OF limit due to some temporary buffer size * whether this is just an OF limit due to some temporary buffer size
* or if this is an SMU imposed limit. This driver has the same limitation * or if this is an SMU imposed limit. This driver has the same limitation
* for now as I use a 0x10 bytes temporary buffer as well * for now as I use a 0x10 bytes temporary buffer as well
* *
@ -236,7 +236,7 @@
* 3 (optional): enable nmi? [0x00 or 0x01] * 3 (optional): enable nmi? [0x00 or 0x01]
* *
* Returns: * Returns:
* If parameter 2 is 0x00 and parameter 3 is not specified, returns wether * If parameter 2 is 0x00 and parameter 3 is not specified, returns whether
* NMI is enabled. Otherwise unknown. * NMI is enabled. Otherwise unknown.
*/ */
#define SMU_CMD_MISC_df_NMI_OPTION 0x04 #define SMU_CMD_MISC_df_NMI_OPTION 0x04

2
arch/powerpc/kernel/legacy_serial.c
View file

@ -387,7 +387,7 @@ void __init find_legacy_serial_ports(void)
of_node_put(parent); of_node_put(parent);
continue; continue;
} }
/* Check for known pciclass, and also check wether we have /* Check for known pciclass, and also check whether we have
* a device with child nodes for ports or not * a device with child nodes for ports or not
*/ */
if (of_device_is_compatible(np, "pciclass,0700") || if (of_device_is_compatible(np, "pciclass,0700") ||

2
arch/powerpc/kernel/of_platform.c
View file

@ -82,7 +82,7 @@ static int __devinit of_pci_phb_probe(struct platform_device *dev)
return -ENXIO; return -ENXIO;
/* Claim resources. This might need some rework as well depending /* Claim resources. This might need some rework as well depending
* wether we are doing probe-only or not, like assigning unassigned * whether we are doing probe-only or not, like assigning unassigned
* resources etc... * resources etc...
*/ */
pcibios_claim_one_bus(phb->bus); pcibios_claim_one_bus(phb->bus);

2
arch/powerpc/kernel/signal_64.c
View file

@ -83,7 +83,7 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
* the context). This is very important because we must ensure we * the context). This is very important because we must ensure we
* don't lose the VRSAVE content that may have been set prior to * don't lose the VRSAVE content that may have been set prior to
* the process doing its first vector operation * the process doing its first vector operation
* Userland shall check AT_HWCAP to know wether it can rely on the * Userland shall check AT_HWCAP to know whether it can rely on the
* v_regs pointer or not * v_regs pointer or not
*/ */
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC

2
arch/powerpc/mm/slice.c
View file

@ -722,7 +722,7 @@ void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
} }
/* /*
* is_hugepage_only_range() is used by generic code to verify wether * is_hugepage_only_range() is used by generic code to verify whether
* a normal mmap mapping (non hugetlbfs) is valid on a given area. * a normal mmap mapping (non hugetlbfs) is valid on a given area.
* *
* until the generic code provides a more generic hook and/or starts * until the generic code provides a more generic hook and/or starts

2
arch/powerpc/platforms/52xx/mpc52xx_gpt.c
View file

@ -526,7 +526,7 @@ EXPORT_SYMBOL(mpc52xx_gpt_timer_period);
#define WDT_IDENTITY "mpc52xx watchdog on GPT0" #define WDT_IDENTITY "mpc52xx watchdog on GPT0"
/* wdt_is_active stores wether or not the /dev/watchdog device is opened */ /* wdt_is_active stores whether or not the /dev/watchdog device is opened */
static unsigned long wdt_is_active; static unsigned long wdt_is_active;
/* wdt-capable gpt */ /* wdt-capable gpt */

2
arch/powerpc/platforms/cell/iommu.c
View file

@ -728,7 +728,7 @@ static struct cbe_iommu * __init cell_iommu_alloc(struct device_node *np)
nid, np->full_name); nid, np->full_name);
/* XXX todo: If we can have multiple windows on the same IOMMU, which /* XXX todo: If we can have multiple windows on the same IOMMU, which
* isn't the case today, we probably want here to check wether the * isn't the case today, we probably want here to check whether the
* iommu for that node is already setup. * iommu for that node is already setup.
* However, there might be issue with getting the size right so let's * However, there might be issue with getting the size right so let's
* ignore that for now. We might want to completely get rid of the * ignore that for now. We might want to completely get rid of the

6
arch/powerpc/platforms/cell/spider-pic.c
View file

@ -148,7 +148,7 @@ static int spider_set_irq_type(struct irq_data *d, unsigned int type)
/* Configure the source. One gross hack that was there before and /* Configure the source. One gross hack that was there before and
* that I've kept around is the priority to the BE which I set to * that I've kept around is the priority to the BE which I set to
* be the same as the interrupt source number. I don't know wether * be the same as the interrupt source number. I don't know whether
* that's supposed to make any kind of sense however, we'll have to * that's supposed to make any kind of sense however, we'll have to
* decide that, but for now, I'm not changing the behaviour. * decide that, but for now, I'm not changing the behaviour.
*/ */
@ -220,7 +220,7 @@ static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc)
/* For hooking up the cascace we have a problem. Our device-tree is /* For hooking up the cascace we have a problem. Our device-tree is
* crap and we don't know on which BE iic interrupt we are hooked on at * crap and we don't know on which BE iic interrupt we are hooked on at
* least not the "standard" way. We can reconstitute it based on two * least not the "standard" way. We can reconstitute it based on two
* informations though: which BE node we are connected to and wether * informations though: which BE node we are connected to and whether
* we are connected to IOIF0 or IOIF1. Right now, we really only care * we are connected to IOIF0 or IOIF1. Right now, we really only care
* about the IBM cell blade and we know that its firmware gives us an * about the IBM cell blade and we know that its firmware gives us an
* interrupt-map property which is pretty strange. * interrupt-map property which is pretty strange.
@ -232,7 +232,7 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
int imaplen, intsize, unit; int imaplen, intsize, unit;
struct device_node *iic; struct device_node *iic;
/* First, we check wether we have a real "interrupts" in the device /* First, we check whether we have a real "interrupts" in the device
* tree in case the device-tree is ever fixed * tree in case the device-tree is ever fixed
*/ */
struct of_irq oirq; struct of_irq oirq;

2
arch/powerpc/platforms/powermac/pic.c
View file

@ -529,7 +529,7 @@ static int __init pmac_pic_probe_mpic(void)
void __init pmac_pic_init(void) void __init pmac_pic_init(void)
{ {
/* We configure the OF parsing based on our oldworld vs. newworld /* We configure the OF parsing based on our oldworld vs. newworld
* platform type and wether we were booted by BootX. * platform type and whether we were booted by BootX.
*/ */
#ifdef CONFIG_PPC32 #ifdef CONFIG_PPC32
if (!pmac_newworld) if (!pmac_newworld)

2
arch/sh/boards/board-espt.c
View file

@ -1,5 +1,5 @@
/* /*
* Data Technology Inc. ESPT-GIGA board suport * Data Technology Inc. ESPT-GIGA board support
* *
* Copyright (C) 2008, 2009 Renesas Solutions Corp. * Copyright (C) 2008, 2009 Renesas Solutions Corp.
* Copyright (C) 2008, 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> * Copyright (C) 2008, 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>

1
arch/x86/boot/.gitignore vendored
View file

@ -2,7 +2,6 @@ bootsect
bzImage bzImage
cpustr.h cpustr.h
mkcpustr mkcpustr
offsets.h
voffset.h voffset.h
zoffset.h zoffset.h
setup setup

2
arch/x86/kernel/cpu/mtrr/main.c
View file

@ -606,7 +606,7 @@ void __init mtrr_bp_init(void)
/* /*
* This is an AMD specific MSR, but we assume(hope?) that * This is an AMD specific MSR, but we assume(hope?) that
* Intel will implement it to when they extend the address * Intel will implement it too when they extend the address
* bus of the Xeon. * bus of the Xeon.
*/ */
if (cpuid_eax(0x80000000) >= 0x80000008) { if (cpuid_eax(0x80000000) >= 0x80000008) {

2
arch/x86/mm/pgtable.c
View file

@ -137,7 +137,7 @@ static void pgd_dtor(pgd_t *pgd)
* against pageattr.c; it is the unique case in which a valid change * against pageattr.c; it is the unique case in which a valid change
* of kernel pagetables can't be lazily synchronized by vmalloc faults. * of kernel pagetables can't be lazily synchronized by vmalloc faults.
* vmalloc faults work because attached pagetables are never freed. * vmalloc faults work because attached pagetables are never freed.
* -- wli * -- nyc
*/ */
#ifdef CONFIG_X86_PAE #ifdef CONFIG_X86_PAE

2
drivers/acpi/acpica/dsopcode.c
View file

@ -1,6 +1,6 @@
/****************************************************************************** /******************************************************************************
* *
* Module Name: dsopcode - Dispatcher suport for regions and fields * Module Name: dsopcode - Dispatcher support for regions and fields
* *
*****************************************************************************/ *****************************************************************************/

2
drivers/char/ipmi/ipmi_msghandler.c
View file

@ -3789,7 +3789,7 @@ static int handle_one_recv_msg(ipmi_smi_t intf,
} else if ((msg->rsp[0] == ((IPMI_NETFN_APP_REQUEST|1) << 2)) } else if ((msg->rsp[0] == ((IPMI_NETFN_APP_REQUEST|1) << 2))
&& (msg->rsp[1] == IPMI_READ_EVENT_MSG_BUFFER_CMD)) { && (msg->rsp[1] == IPMI_READ_EVENT_MSG_BUFFER_CMD)) {
/* It's an asyncronous event. */ /* It's an asynchronous event. */
requeue = handle_read_event_rsp(intf, msg); requeue = handle_read_event_rsp(intf, msg);
} else { } else {
/* It's a response from the local BMC. */ /* It's a response from the local BMC. */

2
drivers/char/ipmi/ipmi_si_intf.c
View file

@ -155,7 +155,7 @@ enum si_stat_indexes {
/* Number of watchdog pretimeouts. */ /* Number of watchdog pretimeouts. */
SI_STAT_watchdog_pretimeouts, SI_STAT_watchdog_pretimeouts,
/* Number of asyncronous messages received. */ /* Number of asynchronous messages received. */
SI_STAT_incoming_messages, SI_STAT_incoming_messages,

6
drivers/char/ppdev.c
View file

@ -251,12 +251,8 @@ static ssize_t pp_write (struct file * file, const char __user * buf,
break; break;
} }
if (signal_pending (current)) { if (signal_pending (current))
if (!bytes_written) {
bytes_written = -EINTR;
}
break; break;
}
cond_resched(); cond_resched();
} }

4
drivers/eisa/eisa.ids
View file

@ -985,8 +985,8 @@ ISABD00 "Racal-Interlan NP600A Ethernet 16bit"
ISABD02 "Racal-Interlan NI5210/8 Ethernet" ISABD02 "Racal-Interlan NI5210/8 Ethernet"
ISABD03 "Racal-Interlan NI5210/16 Ethernet" ISABD03 "Racal-Interlan NI5210/16 Ethernet"
ISABE00 "Qua Tech PXB-1608 Parallel Expansion Board" ISABE00 "Qua Tech PXB-1608 Parallel Expansion Board"
ISABE01 "Qua Tech ES-100 8 Channel Asyncronous" ISABE01 "Qua Tech ES-100 8 Channel Asynchronous"
ISABE02 "Qua Tech QS-100M 4 Channel Asyncronous" ISABE02 "Qua Tech QS-100M 4 Channel Asynchronous"
ISABE03 "Qua Tech MXI-100 IEEE 488 GPIB" ISABE03 "Qua Tech MXI-100 IEEE 488 GPIB"
ISABE04 "Qua Tech DS-201 Dual Channel RS-422" ISABE04 "Qua Tech DS-201 Dual Channel RS-422"
ISABE05 "Qua Tech PXB-721 Parallel Expansion" ISABE05 "Qua Tech PXB-721 Parallel Expansion"

4
drivers/firewire/init_ohci1394_dma.c
View file

@ -149,10 +149,10 @@ static inline void __init init_ohci1394_initialize(struct ohci *ohci)
reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, 0xffffffff); reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, 0xffffffff);
reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 0xffffffff); reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 0xffffffff);
/* Accept asyncronous transfer requests from all nodes for now */ /* Accept asynchronous transfer requests from all nodes for now */
reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000); reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000);
/* Specify asyncronous transfer retries */ /* Specify asynchronous transfer retries */
reg_write(ohci, OHCI1394_ATRetries, reg_write(ohci, OHCI1394_ATRetries,
OHCI1394_MAX_AT_REQ_RETRIES | OHCI1394_MAX_AT_REQ_RETRIES |
(OHCI1394_MAX_AT_RESP_RETRIES<<4) | (OHCI1394_MAX_AT_RESP_RETRIES<<4) |

2
drivers/firewire/ohci.c
View file

@ -1281,7 +1281,7 @@ static int at_context_queue_packet(struct context *ctx,
d[0].res_count = cpu_to_le16(packet->timestamp); d[0].res_count = cpu_to_le16(packet->timestamp);
/* /*
* The DMA format for asyncronous link packets is different * The DMA format for asynchronous link packets is different
* from the IEEE1394 layout, so shift the fields around * from the IEEE1394 layout, so shift the fields around
* accordingly. * accordingly.
*/ */

2
drivers/gpio/Kconfig
View file

@ -504,7 +504,7 @@ config GPIO_ADNP
help help
This option enables support for N GPIOs found on Avionic Design This option enables support for N GPIOs found on Avionic Design
I2C GPIO expanders. The register space will be extended by powers I2C GPIO expanders. The register space will be extended by powers
of two, so the controller will need to accomodate for that. For of two, so the controller will need to accommodate for that. For
example: if a controller provides 48 pins, 6 registers will be example: if a controller provides 48 pins, 6 registers will be
enough to represent all pins, but the driver will assume a enough to represent all pins, but the driver will assume a
register layout for 64 pins (8 registers). register layout for 64 pins (8 registers).

2
drivers/gpu/drm/radeon/evergreen.c
View file

@ -1650,7 +1650,7 @@ static int evergreen_cp_resume(struct radeon_device *rdev)
ring->wptr = 0; ring->wptr = 0;
WREG32(CP_RB_WPTR, ring->wptr); WREG32(CP_RB_WPTR, ring->wptr);
/* set the wb address wether it's enabled or not */ /* set the wb address whether it's enabled or not */
WREG32(CP_RB_RPTR_ADDR, WREG32(CP_RB_RPTR_ADDR,
((rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC)); ((rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC));
WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); WREG32(CP_RB_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF);

4
drivers/gpu/drm/radeon/ni.c
View file

@ -1059,7 +1059,7 @@ static int cayman_cp_resume(struct radeon_device *rdev)
WREG32(CP_DEBUG, (1 << 27)); WREG32(CP_DEBUG, (1 << 27));
/* set the wb address wether it's enabled or not */ /* set the wb address whether it's enabled or not */
WREG32(SCRATCH_ADDR, ((rdev->wb.gpu_addr + RADEON_WB_SCRATCH_OFFSET) >> 8) & 0xFFFFFFFF); WREG32(SCRATCH_ADDR, ((rdev->wb.gpu_addr + RADEON_WB_SCRATCH_OFFSET) >> 8) & 0xFFFFFFFF);
WREG32(SCRATCH_UMSK, 0xff); WREG32(SCRATCH_UMSK, 0xff);
@ -1076,7 +1076,7 @@ static int cayman_cp_resume(struct radeon_device *rdev)
#endif #endif
WREG32(cp_rb_cntl[i], rb_cntl); WREG32(cp_rb_cntl[i], rb_cntl);
/* set the wb address wether it's enabled or not */ /* set the wb address whether it's enabled or not */
addr = rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET; addr = rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET;
WREG32(cp_rb_rptr_addr[i], addr & 0xFFFFFFFC); WREG32(cp_rb_rptr_addr[i], addr & 0xFFFFFFFC);
WREG32(cp_rb_rptr_addr_hi[i], upper_32_bits(addr) & 0xFF); WREG32(cp_rb_rptr_addr_hi[i], upper_32_bits(addr) & 0xFF);

4
drivers/gpu/drm/radeon/radeon_ring.c
View file

@ -459,7 +459,7 @@ void radeon_ring_unlock_commit(struct radeon_device *rdev, struct radeon_ring *r
* *
* @ring: radeon_ring structure holding ring information * @ring: radeon_ring structure holding ring information
* *
* Reset the driver's copy of the wtpr (all asics). * Reset the driver's copy of the wptr (all asics).
*/ */
void radeon_ring_undo(struct radeon_ring *ring) void radeon_ring_undo(struct radeon_ring *ring)
{ {
@ -503,7 +503,7 @@ void radeon_ring_force_activity(struct radeon_device *rdev, struct radeon_ring *
} }
/** /**
* radeon_ring_force_activity - update lockup variables * radeon_ring_lockup_update - update lockup variables
* *
* @ring: radeon_ring structure holding ring information * @ring: radeon_ring structure holding ring information
* *

6
drivers/gpu/drm/radeon/si.c
View file

@ -2007,7 +2007,7 @@ static int si_cp_resume(struct radeon_device *rdev)
ring->wptr = 0; ring->wptr = 0;
WREG32(CP_RB0_WPTR, ring->wptr); WREG32(CP_RB0_WPTR, ring->wptr);
/* set the wb address wether it's enabled or not */ /* set the wb address whether it's enabled or not */
WREG32(CP_RB0_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC); WREG32(CP_RB0_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFFFFFFFC);
WREG32(CP_RB0_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF); WREG32(CP_RB0_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP_RPTR_OFFSET) & 0xFF);
@ -2040,7 +2040,7 @@ static int si_cp_resume(struct radeon_device *rdev)
ring->wptr = 0; ring->wptr = 0;
WREG32(CP_RB1_WPTR, ring->wptr); WREG32(CP_RB1_WPTR, ring->wptr);
/* set the wb address wether it's enabled or not */ /* set the wb address whether it's enabled or not */
WREG32(CP_RB1_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFFFFFFFC); WREG32(CP_RB1_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFFFFFFFC);
WREG32(CP_RB1_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFF); WREG32(CP_RB1_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP1_RPTR_OFFSET) & 0xFF);
@ -2066,7 +2066,7 @@ static int si_cp_resume(struct radeon_device *rdev)
ring->wptr = 0; ring->wptr = 0;
WREG32(CP_RB2_WPTR, ring->wptr); WREG32(CP_RB2_WPTR, ring->wptr);
/* set the wb address wether it's enabled or not */ /* set the wb address whether it's enabled or not */
WREG32(CP_RB2_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFFFFFFFC); WREG32(CP_RB2_RPTR_ADDR, (rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFFFFFFFC);
WREG32(CP_RB2_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFF); WREG32(CP_RB2_RPTR_ADDR_HI, upper_32_bits(rdev->wb.gpu_addr + RADEON_WB_CP2_RPTR_OFFSET) & 0xFF);

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

@ -304,7 +304,7 @@ retry_write:
case STATE_READ: case STATE_READ:
/* we have a byte of data in the data register, do /* we have a byte of data in the data register, do
* something with it, and then work out wether we are * something with it, and then work out whether we are
* going to do any more read/write * going to do any more read/write
*/ */

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

@ -208,7 +208,7 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c,
if (msg->flags & I2C_M_REV_DIR_ADDR) if (msg->flags & I2C_M_REV_DIR_ADDR)
addr ^= 1; addr ^= 1;
/* todo - check for wether ack wanted or not */ /* todo - check for whether ack wanted or not */
s3c24xx_i2c_enable_ack(i2c); s3c24xx_i2c_enable_ack(i2c);
iiccon = readl(i2c->regs + S3C2410_IICCON); iiccon = readl(i2c->regs + S3C2410_IICCON);
@ -397,7 +397,7 @@ static int i2c_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
case STATE_READ: case STATE_READ:
/* we have a byte of data in the data register, do /* we have a byte of data in the data register, do
* something with it, and then work out wether we are * something with it, and then work out whether we are
* going to do any more read/write * going to do any more read/write
*/ */

2
drivers/isdn/hisax/amd7930_fn.c
View file

@ -628,7 +628,7 @@ Amd7930_l1hw(struct PStack *st, int pr, void *arg)
if ((cs->dc.amd7930.ph_state == 8)) { if ((cs->dc.amd7930.ph_state == 8)) {
/* b-channels off, PH-AR cleared /* b-channels off, PH-AR cleared
* change to F3 */ * change to F3 */
Amd7930_ph_command(cs, 0x20, "HW_RESET REQEST"); //LMR1 bit 5 Amd7930_ph_command(cs, 0x20, "HW_RESET REQUEST"); //LMR1 bit 5
spin_unlock_irqrestore(&cs->lock, flags); spin_unlock_irqrestore(&cs->lock, flags);
} else { } else {
Amd7930_ph_command(cs, 0x40, "HW_RESET REQUEST"); Amd7930_ph_command(cs, 0x40, "HW_RESET REQUEST");

2
drivers/isdn/hisax/isar.c
View file

@ -1417,7 +1417,7 @@ modeisar(struct BCState *bcs, int mode, int bc)
&bcs->hw.isar.reg->Flags)) &bcs->hw.isar.reg->Flags))
bcs->hw.isar.dpath = 1; bcs->hw.isar.dpath = 1;
else { else {
printk(KERN_WARNING"isar modeisar both pathes in use\n"); printk(KERN_WARNING"isar modeisar both paths in use\n");
return (1); return (1);
} }
break; break;

2
drivers/md/md.c
View file

@ -4124,7 +4124,7 @@ static struct md_sysfs_entry md_size =
__ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store); __ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store);
/* Metdata version. /* Metadata version.
* This is one of * This is one of
* 'none' for arrays with no metadata (good luck...) * 'none' for arrays with no metadata (good luck...)
* 'external' for arrays with externally managed metadata, * 'external' for arrays with externally managed metadata,

4
drivers/md/persistent-data/dm-block-manager.c
View file

@ -25,7 +25,7 @@
* may be held at once. This is just an implementation detail. * may be held at once. This is just an implementation detail.
* *
* ii) Recursive locking attempts are detected and return EINVAL. A stack * ii) Recursive locking attempts are detected and return EINVAL. A stack
* trace is also emitted for the previous lock aquisition. * trace is also emitted for the previous lock acquisition.
* *
* iii) Priority is given to write locks. * iii) Priority is given to write locks.
*/ */
@ -109,7 +109,7 @@ static int __check_holder(struct block_lock *lock)
DMERR("previously held here:"); DMERR("previously held here:");
print_stack_trace(lock->traces + i, 4); print_stack_trace(lock->traces + i, 4);
DMERR("subsequent aquisition attempted here:"); DMERR("subsequent acquisition attempted here:");
t.nr_entries = 0; t.nr_entries = 0;
t.max_entries = MAX_STACK; t.max_entries = MAX_STACK;
t.entries = entries; t.entries = entries;

2
drivers/md/persistent-data/dm-btree.h
View file

@ -35,7 +35,7 @@ struct dm_transaction_manager;
*/ */
/* /*
* Infomation about the values stored within the btree. * Information about the values stored within the btree.
*/ */
struct dm_btree_value_type { struct dm_btree_value_type {
void *context; void *context;

2
drivers/md/raid5.c
View file

@ -1576,7 +1576,7 @@ static int resize_stripes(struct r5conf *conf, int newsize)
* This happens in stages: * This happens in stages:
* 1/ create a new kmem_cache and allocate the required number of * 1/ create a new kmem_cache and allocate the required number of
* stripe_heads. * stripe_heads.
* 2/ gather all the old stripe_heads and tranfer the pages across * 2/ gather all the old stripe_heads and transfer the pages across
* to the new stripe_heads. This will have the side effect of * to the new stripe_heads. This will have the side effect of
* freezing the array as once all stripe_heads have been collected, * freezing the array as once all stripe_heads have been collected,
* no IO will be possible. Old stripe heads are freed once their * no IO will be possible. Old stripe heads are freed once their

2
drivers/media/dvb-frontends/drxk_hard.c
View file

@ -948,7 +948,7 @@ static int GetDeviceCapabilities(struct drxk_state *state)
state->m_oscClockFreq = 20250; state->m_oscClockFreq = 20250;
break; break;
default: default:
printk(KERN_ERR "drxk: Clock Frequency is unkonwn\n"); printk(KERN_ERR "drxk: Clock Frequency is unknown\n");
return -EINVAL; return -EINVAL;
} }
/* /*

2
drivers/media/platform/mx2_emmaprp.c
View file

@ -371,7 +371,7 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data)
if (!curr_ctx->aborting) { if (!curr_ctx->aborting) {
if ((irqst & PRP_INTR_ST_RDERR) || if ((irqst & PRP_INTR_ST_RDERR) ||
(irqst & PRP_INTR_ST_CH2WERR)) { (irqst & PRP_INTR_ST_CH2WERR)) {
pr_err("PrP bus error ocurred, this transfer is probably corrupted\n"); pr_err("PrP bus error occurred, this transfer is probably corrupted\n");
writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL); writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL);
} else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */ } else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */
src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx);

12
drivers/message/i2o/README.ioctl
View file

@ -138,7 +138,7 @@ VI. Setting Parameters
The return value is the size in bytes of the data written into The return value is the size in bytes of the data written into
ops->resbuf if no errors occur. If an error occurs, -1 is returned ops->resbuf if no errors occur. If an error occurs, -1 is returned
and errno is set appropriatly: and errno is set appropriately:
EFAULT Invalid user space pointer was passed EFAULT Invalid user space pointer was passed
ENXIO Invalid IOP number ENXIO Invalid IOP number
@ -222,7 +222,7 @@ VIII. Downloading Software
RETURNS RETURNS
This function returns 0 no errors occur. If an error occurs, -1 This function returns 0 no errors occur. If an error occurs, -1
is returned and errno is set appropriatly: is returned and errno is set appropriately:
EFAULT Invalid user space pointer was passed EFAULT Invalid user space pointer was passed
ENXIO Invalid IOP number ENXIO Invalid IOP number
@ -264,7 +264,7 @@ IX. Uploading Software
RETURNS RETURNS
This function returns 0 if no errors occur. If an error occurs, -1 This function returns 0 if no errors occur. If an error occurs, -1
is returned and errno is set appropriatly: is returned and errno is set appropriately:
EFAULT Invalid user space pointer was passed EFAULT Invalid user space pointer was passed
ENXIO Invalid IOP number ENXIO Invalid IOP number
@ -301,7 +301,7 @@ X. Removing Software
RETURNS RETURNS
This function returns 0 if no errors occur. If an error occurs, -1 This function returns 0 if no errors occur. If an error occurs, -1
is returned and errno is set appropriatly: is returned and errno is set appropriately:
EFAULT Invalid user space pointer was passed EFAULT Invalid user space pointer was passed
ENXIO Invalid IOP number ENXIO Invalid IOP number
@ -325,7 +325,7 @@ X. Validating Configuration
RETURNS RETURNS
This function returns 0 if no erro occur. If an error occurs, -1 is This function returns 0 if no erro occur. If an error occurs, -1 is
returned and errno is set appropriatly: returned and errno is set appropriately:
ETIMEDOUT Timeout waiting for reply message ETIMEDOUT Timeout waiting for reply message
ENXIO Invalid IOP number ENXIO Invalid IOP number
@ -360,7 +360,7 @@ XI. Configuration Dialog
RETURNS RETURNS
This function returns 0 if no error occur. If an error occurs, -1 This function returns 0 if no error occur. If an error occurs, -1
is returned and errno is set appropriatly: is returned and errno is set appropriately:
EFAULT Invalid user space pointer was passed EFAULT Invalid user space pointer was passed
ENXIO Invalid IOP number ENXIO Invalid IOP number

2
drivers/message/i2o/i2o_block.c
View file

@ -609,7 +609,7 @@ static int i2o_block_release(struct gendisk *disk, fmode_t mode)
u8 operation; u8 operation;
/* /*
* This is to deail with the case of an application * This is to deal with the case of an application
* opening a device and then the device disappears while * opening a device and then the device disappears while
* it's in use, and then the application tries to release * it's in use, and then the application tries to release
* it. ex: Unmounting a deleted RAID volume at reboot. * it. ex: Unmounting a deleted RAID volume at reboot.

2
drivers/message/i2o/i2o_config.c
View file

@ -189,7 +189,7 @@ static int i2o_cfg_parms(unsigned long arg, unsigned int type)
return -ENXIO; return -ENXIO;
/* /*
* Stop users being able to try and allocate arbitary amounts * Stop users being able to try and allocate arbitrary amounts
* of DMA space. 64K is way more than sufficient for this. * of DMA space. 64K is way more than sufficient for this.
*/ */
if (kcmd.oplen > 65536) if (kcmd.oplen > 65536)

2
drivers/mmc/host/Kconfig
View file

@ -533,7 +533,7 @@ config MMC_DW_PLTFM
If unsure, say Y. If unsure, say Y.
config MMC_DW_EXYNOS config MMC_DW_EXYNOS
tristate "Exynos specific extentions for Synopsys DW Memory Card Interface" tristate "Exynos specific extensions for Synopsys DW Memory Card Interface"
depends on MMC_DW depends on MMC_DW
select MMC_DW_PLTFM select MMC_DW_PLTFM
help help

2
drivers/mtd/maps/plat-ram.c
View file

@ -219,7 +219,7 @@ static int platram_probe(struct platform_device *pdev)
platram_setrw(info, PLATRAM_RW); platram_setrw(info, PLATRAM_RW);
/* check to see if there are any available partitions, or wether /* check to see if there are any available partitions, or whether
* to add this device whole */ * to add this device whole */
err = mtd_device_parse_register(info->mtd, pdata->probes, NULL, err = mtd_device_parse_register(info->mtd, pdata->probes, NULL,

2
drivers/mtd/nand/s3c2410.c
View file

@ -879,7 +879,7 @@ static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info,
if (chip->ecc.mode != NAND_ECC_HW) if (chip->ecc.mode != NAND_ECC_HW)
return; return;
/* change the behaviour depending on wether we are using /* change the behaviour depending on whether we are using
* the large or small page nand device */ * the large or small page nand device */
if (chip->page_shift > 10) { if (chip->page_shift > 10) {

2
drivers/net/bonding/bonding.h
View file

@ -245,7 +245,7 @@ struct bonding {
struct delayed_work ad_work; struct delayed_work ad_work;
struct delayed_work mcast_work; struct delayed_work mcast_work;
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
/* debugging suport via debugfs */ /* debugging support via debugfs */
struct dentry *debug_dir; struct dentry *debug_dir;
#endif /* CONFIG_DEBUG_FS */ #endif /* CONFIG_DEBUG_FS */
}; };

2
drivers/net/ethernet/8390/ax88796.c
View file

@ -109,7 +109,7 @@ static inline struct ax_device *to_ax_dev(struct net_device *dev)
/* /*
* ax_initial_check * ax_initial_check
* *
* do an initial probe for the card to check wether it exists * do an initial probe for the card to check whether it exists
* and is functional * and is functional
*/ */
static int ax_initial_check(struct net_device *dev) static int ax_initial_check(struct net_device *dev)

2
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
View file

@ -4318,7 +4318,7 @@ static int bnx2x_queue_comp_cmd(struct bnx2x *bp,
if (o->next_tx_only >= o->max_cos) if (o->next_tx_only >= o->max_cos)
/* >= becuase tx only must always be smaller than cos since the /* >= becuase tx only must always be smaller than cos since the
* primary connection suports COS 0 * primary connection supports COS 0
*/ */
BNX2X_ERR("illegal value for next tx_only: %d. max cos was %d", BNX2X_ERR("illegal value for next tx_only: %d. max cos was %d",
o->next_tx_only, o->max_cos); o->next_tx_only, o->max_cos);

2
drivers/net/ethernet/intel/e1000/e1000_ethtool.c
View file

@ -1671,7 +1671,7 @@ static void e1000_get_wol(struct net_device *netdev,
/* apply any specific unsupported masks here */ /* apply any specific unsupported masks here */
switch (hw->device_id) { switch (hw->device_id) {
case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
/* KSP3 does not suppport UCAST wake-ups */ /* KSP3 does not support UCAST wake-ups */
wol->supported &= ~WAKE_UCAST; wol->supported &= ~WAKE_UCAST;
if (adapter->wol & E1000_WUFC_EX) if (adapter->wol & E1000_WUFC_EX)

2
drivers/net/ethernet/mellanox/mlx4/eq.c
View file

@ -1267,7 +1267,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)
/* Temporary use polling for command completions */ /* Temporary use polling for command completions */
mlx4_cmd_use_polling(dev); mlx4_cmd_use_polling(dev);
/* Map the new eq to handle all asyncronous events */ /* Map the new eq to handle all asynchronous events */
err = mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0, err = mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0,
priv->eq_table.eq[i].eqn); priv->eq_table.eq[i].eqn);
if (err) { if (err) {

2
drivers/net/ethernet/micrel/ksz884x.c
View file

@ -6769,7 +6769,7 @@ static int stp;
/* /*
* This enables fast aging in the KSZ8842 switch. Not sure what situation * This enables fast aging in the KSZ8842 switch. Not sure what situation
* needs that. However, fast aging is used to flush the dynamic MAC table when * needs that. However, fast aging is used to flush the dynamic MAC table when
* STP suport is enabled. * STP support is enabled.
*/ */
static int fast_aging; static int fast_aging;

2
drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
View file

@ -27,7 +27,7 @@ struct mcp_gen_header {
* *
* Fields below this comment are extensions added in later versions * Fields below this comment are extensions added in later versions
* of this struct, drivers should compare the header_length against * of this struct, drivers should compare the header_length against
* offsetof(field) to check wether a given MCP implements them. * offsetof(field) to check whether a given MCP implements them.
* *
* Never remove any field. Keep everything naturally align. * Never remove any field. Keep everything naturally align.
*/ */

8
drivers/net/sungem_phy.c
View file

@ -608,7 +608,7 @@ static int bcm5421_poll_link(struct mii_phy* phy)
if ( mode == BCM54XX_COPPER) if ( mode == BCM54XX_COPPER)
return genmii_poll_link(phy); return genmii_poll_link(phy);
/* try to find out wether we have a link */ /* try to find out whether we have a link */
phy_write(phy, MII_NCONFIG, 0x2000); phy_write(phy, MII_NCONFIG, 0x2000);
phy_reg = phy_read(phy, MII_NCONFIG); phy_reg = phy_read(phy, MII_NCONFIG);
@ -634,7 +634,7 @@ static int bcm5421_read_link(struct mii_phy* phy)
phy->speed = SPEED_1000; phy->speed = SPEED_1000;
/* find out wether we are running half- or full duplex */ /* find out whether we are running half- or full duplex */
phy_write(phy, MII_NCONFIG, 0x2000); phy_write(phy, MII_NCONFIG, 0x2000);
phy_reg = phy_read(phy, MII_NCONFIG); phy_reg = phy_read(phy, MII_NCONFIG);
@ -681,7 +681,7 @@ static int bcm5461_poll_link(struct mii_phy* phy)
if ( mode == BCM54XX_COPPER) if ( mode == BCM54XX_COPPER)
return genmii_poll_link(phy); return genmii_poll_link(phy);
/* find out wether we have a link */ /* find out whether we have a link */
phy_write(phy, MII_NCONFIG, 0x7000); phy_write(phy, MII_NCONFIG, 0x7000);
phy_reg = phy_read(phy, MII_NCONFIG); phy_reg = phy_read(phy, MII_NCONFIG);
@ -710,7 +710,7 @@ static int bcm5461_read_link(struct mii_phy* phy)
phy->speed = SPEED_1000; phy->speed = SPEED_1000;
/* find out wether we are running half- or full duplex */ /* find out whether we are running half- or full duplex */
phy_write(phy, MII_NCONFIG, 0x7000); phy_write(phy, MII_NCONFIG, 0x7000);
phy_reg = phy_read(phy, MII_NCONFIG); phy_reg = phy_read(phy, MII_NCONFIG);

1
drivers/net/wimax/i2400m/debugfs.c
View file

@ -209,6 +209,7 @@ int debugfs_i2400m_reset_set(void *data, u64 val)
result = i2400m_reset(i2400m, rt); result = i2400m_reset(i2400m, rt);
if (result >= 0) if (result >= 0)
result = 0; result = 0;
break;
default: default:
result = -EINVAL; result = -EINVAL;
} }

2
drivers/net/wireless/atmel.c
View file

@ -2963,7 +2963,7 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
ssid_el_p[1] = priv->SSID_size; ssid_el_p[1] = priv->SSID_size;
memcpy(ssid_el_p + 2, priv->SSID, priv->SSID_size); memcpy(ssid_el_p + 2, priv->SSID, priv->SSID_size);
ssid_el_p[2 + priv->SSID_size] = WLAN_EID_SUPP_RATES; ssid_el_p[2 + priv->SSID_size] = WLAN_EID_SUPP_RATES;
ssid_el_p[3 + priv->SSID_size] = 4; /* len of suported rates */ ssid_el_p[3 + priv->SSID_size] = 4; /* len of supported rates */
memcpy(ssid_el_p + 4 + priv->SSID_size, atmel_basic_rates, 4); memcpy(ssid_el_p + 4 + priv->SSID_size, atmel_basic_rates, 4);
atmel_transmit_management_frame(priv, &header, (void *)&body, bodysize); atmel_transmit_management_frame(priv, &header, (void *)&body, bodysize);

2
drivers/net/wireless/ipw2x00/ipw2100.h
View file

@ -1045,7 +1045,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
IPW_ORD_POWER_MGMT_MODE, // Power mode - 0=CAM, 1=PSP IPW_ORD_POWER_MGMT_MODE, // Power mode - 0=CAM, 1=PSP
IPW_ORD_POWER_MGMT_INDEX, //NS // IPW_ORD_POWER_MGMT_INDEX, //NS //
IPW_ORD_COUNTRY_CODE, // IEEE country code as recv'd from beacon IPW_ORD_COUNTRY_CODE, // IEEE country code as recv'd from beacon
IPW_ORD_COUNTRY_CHANNELS, // channels suported by country IPW_ORD_COUNTRY_CHANNELS, // channels supported by country
// IPW_ORD_COUNTRY_CHANNELS: // IPW_ORD_COUNTRY_CHANNELS:
// For 11b the lower 2-byte are used for channels from 1-14 // For 11b the lower 2-byte are used for channels from 1-14
// and the higher 2-byte are not used. // and the higher 2-byte are not used.

2
drivers/net/wireless/zd1211rw/zd_chip.c
View file

@ -1155,7 +1155,7 @@ int zd_chip_init_hw(struct zd_chip *chip)
if (r) if (r)
goto out; goto out;
/* Currently we support IEEE 802.11g for full and high speed USB. /* Currently we support IEEE 802.11g for full and high speed USB.
* It might be discussed, whether we should suppport pure b mode for * It might be discussed, whether we should support pure b mode for
* full speed USB. * full speed USB.
*/ */
r = set_mandatory_rates(chip, 1); r = set_mandatory_rates(chip, 1);

2
drivers/regulator/palmas-regulator.c
View file

@ -773,7 +773,7 @@ static __devinit int palmas_probe(struct platform_device *pdev)
/* /*
* read and store the RANGE bit for later use * read and store the RANGE bit for later use
* This must be done before regulator is probed otherwise * This must be done before regulator is probed otherwise
* we error in probe with unsuportable ranges. * we error in probe with unsupportable ranges.
*/ */
if (id != PALMAS_REG_SMPS10) { if (id != PALMAS_REG_SMPS10) {
addr = palmas_regs_info[id].vsel_addr; addr = palmas_regs_info[id].vsel_addr;

4
drivers/remoteproc/remoteproc_elf_loader.c
View file

@ -66,13 +66,13 @@ rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
return -EINVAL; return -EINVAL;
} }
/* We assume the firmware has the same endianess as the host */ /* We assume the firmware has the same endianness as the host */
# ifdef __LITTLE_ENDIAN # ifdef __LITTLE_ENDIAN
if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) { if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) {
# else /* BIG ENDIAN */ # else /* BIG ENDIAN */
if (ehdr->e_ident[EI_DATA] != ELFDATA2MSB) { if (ehdr->e_ident[EI_DATA] != ELFDATA2MSB) {
# endif # endif
dev_err(dev, "Unsupported firmware endianess\n"); dev_err(dev, "Unsupported firmware endianness\n");
return -EINVAL; return -EINVAL;
} }

2
drivers/rtc/rtc-isl1208.c
View file

@ -118,7 +118,7 @@ isl1208_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[],
return ret; return ret;
} }
/* simple check to see wether we have a isl1208 */ /* simple check to see whether we have a isl1208 */
static int static int
isl1208_i2c_validate_client(struct i2c_client *client) isl1208_i2c_validate_client(struct i2c_client *client)
{ {

2
drivers/rtc/rtc-s3c.c
View file

@ -186,7 +186,7 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
rtc_tm->tm_year = readb(base + S3C2410_RTCYEAR); rtc_tm->tm_year = readb(base + S3C2410_RTCYEAR);
rtc_tm->tm_sec = readb(base + S3C2410_RTCSEC); rtc_tm->tm_sec = readb(base + S3C2410_RTCSEC);
/* the only way to work out wether the system was mid-update /* the only way to work out whether the system was mid-update
* when we read it is to check the second counter, and if it * when we read it is to check the second counter, and if it
* is zero, then we re-try the entire read * is zero, then we re-try the entire read
*/ */

2
drivers/s390/block/dasd_devmap.c
View file

@ -1344,7 +1344,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature)
/* /*
* Set / reset given feature. * Set / reset given feature.
* Flag indicates wether to set (!=0) or the reset (=0) the feature. * Flag indicates whether to set (!=0) or the reset (=0) the feature.
*/ */
int int
dasd_set_feature(struct ccw_device *cdev, int feature, int flag) dasd_set_feature(struct ccw_device *cdev, int feature, int flag)

Some files were not shown because too many files have changed in this diff Show more