diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
| commit | f39d01be4c59a61a08d0cb53f615e7016b85d339 (patch) | |
| tree | 6777590e3ff2ddf4df1d38444ba7d692cd463b7b | |
| parent | 54291263519ac2c9bdda68b23b02fef3808deed4 (diff) | |
| parent | 7db82437cfcac4bdfe79a6323eb554fdfa271623 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
vlynq: make whole Kconfig-menu dependant on architecture
add descriptive comment for TIF_MEMDIE task flag declaration.
EEPROM: max6875: Header file cleanup
EEPROM: 93cx6: Header file cleanup
EEPROM: Header file cleanup
agp: use NULL instead of 0 when pointer is needed
rtc-v3020: make bitfield unsigned
PCI: make bitfield unsigned
jbd2: use NULL instead of 0 when pointer is needed
cciss: fix shadows sparse warning
doc: inode uses a mutex instead of a semaphore.
uml: i386: Avoid redefinition of NR_syscalls
fix "seperate" typos in comments
cocbalt_lcdfb: correct sections
doc: Change urls for sparse
Powerpc: wii: Fix typo in comment
i2o: cleanup some exit paths
Documentation/: it's -> its where appropriate
UML: Fix compiler warning due to missing task_struct declaration
UML: add kernel.h include to signal.c
...
165 files changed, 313 insertions, 328 deletions
diff --git a/Documentation/ABI/testing/sysfs-devices-memory b/Documentation/ABI/testing/sysfs-devices-memory index bf1627b02a03..aba7d989208c 100644 --- a/Documentation/ABI/testing/sysfs-devices-memory +++ b/Documentation/ABI/testing/sysfs-devices-memory | |||
| @@ -43,7 +43,7 @@ Date: September 2008 | |||
| 43 | Contact: Badari Pulavarty <pbadari@us.ibm.com> | 43 | Contact: Badari Pulavarty <pbadari@us.ibm.com> |
| 44 | Description: | 44 | Description: |
| 45 | The file /sys/devices/system/memory/memoryX/state | 45 | The file /sys/devices/system/memory/memoryX/state |
| 46 | is read-write. When read, it's contents show the | 46 | is read-write. When read, its contents show the |
| 47 | online/offline state of the memory section. When written, | 47 | online/offline state of the memory section. When written, |
| 48 | root can toggle the the online/offline state of a removable | 48 | root can toggle the the online/offline state of a removable |
| 49 | memory section (see removable file description above) | 49 | memory section (see removable file description above) |
diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt index 52618ab069ad..2e435adfbd6b 100644 --- a/Documentation/DMA-API-HOWTO.txt +++ b/Documentation/DMA-API-HOWTO.txt | |||
| @@ -742,7 +742,7 @@ failure can be determined by: | |||
| 742 | 742 | ||
| 743 | Closing | 743 | Closing |
| 744 | 744 | ||
| 745 | This document, and the API itself, would not be in it's current | 745 | This document, and the API itself, would not be in its current |
| 746 | form without the feedback and suggestions from numerous individuals. | 746 | form without the feedback and suggestions from numerous individuals. |
| 747 | We would like to specifically mention, in no particular order, the | 747 | We would like to specifically mention, in no particular order, the |
| 748 | following people: | 748 | following people: |
diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl index ff3e5bec1c24..265c08c96fcd 100644 --- a/Documentation/DocBook/libata.tmpl +++ b/Documentation/DocBook/libata.tmpl | |||
| @@ -477,7 +477,7 @@ void (*host_stop) (struct ata_host_set *host_set); | |||
| 477 | allocates space for a legacy IDE PRD table and returns. | 477 | allocates space for a legacy IDE PRD table and returns. |
| 478 | </para> | 478 | </para> |
| 479 | <para> | 479 | <para> |
| 480 | ->port_stop() is called after ->host_stop(). It's sole function | 480 | ->port_stop() is called after ->host_stop(). Its sole function |
| 481 | is to release DMA/memory resources, now that they are no longer | 481 | is to release DMA/memory resources, now that they are no longer |
| 482 | actively being used. Many drivers also free driver-private | 482 | actively being used. Many drivers also free driver-private |
| 483 | data from port at this time. | 483 | data from port at this time. |
diff --git a/Documentation/PCI/pci-error-recovery.txt b/Documentation/PCI/pci-error-recovery.txt index e83f2ea76415..898ded24510d 100644 --- a/Documentation/PCI/pci-error-recovery.txt +++ b/Documentation/PCI/pci-error-recovery.txt | |||
| @@ -216,7 +216,7 @@ The driver should return one of the following result codes: | |||
| 216 | 216 | ||
| 217 | - PCI_ERS_RESULT_NEED_RESET | 217 | - PCI_ERS_RESULT_NEED_RESET |
| 218 | Driver returns this if it thinks the device is not | 218 | Driver returns this if it thinks the device is not |
| 219 | recoverable in it's current state and it needs a slot | 219 | recoverable in its current state and it needs a slot |
| 220 | reset to proceed. | 220 | reset to proceed. |
| 221 | 221 | ||
| 222 | - PCI_ERS_RESULT_DISCONNECT | 222 | - PCI_ERS_RESULT_DISCONNECT |
| @@ -241,7 +241,7 @@ in working condition. | |||
| 241 | 241 | ||
| 242 | The driver is not supposed to restart normal driver I/O operations | 242 | The driver is not supposed to restart normal driver I/O operations |
| 243 | at this point. It should limit itself to "probing" the device to | 243 | at this point. It should limit itself to "probing" the device to |
| 244 | check it's recoverability status. If all is right, then the platform | 244 | check its recoverability status. If all is right, then the platform |
| 245 | will call resume() once all drivers have ack'd link_reset(). | 245 | will call resume() once all drivers have ack'd link_reset(). |
| 246 | 246 | ||
| 247 | Result codes: | 247 | Result codes: |
diff --git a/Documentation/Smack.txt b/Documentation/Smack.txt index 34614b4c708e..e9dab41c0fe0 100644 --- a/Documentation/Smack.txt +++ b/Documentation/Smack.txt | |||
| @@ -73,7 +73,7 @@ NOTE: Smack labels are limited to 23 characters. The attr command | |||
| 73 | If you don't do anything special all users will get the floor ("_") | 73 | If you don't do anything special all users will get the floor ("_") |
| 74 | label when they log in. If you do want to log in via the hacked ssh | 74 | label when they log in. If you do want to log in via the hacked ssh |
| 75 | at other labels use the attr command to set the smack value on the | 75 | at other labels use the attr command to set the smack value on the |
| 76 | home directory and it's contents. | 76 | home directory and its contents. |
| 77 | 77 | ||
| 78 | You can add access rules in /etc/smack/accesses. They take the form: | 78 | You can add access rules in /etc/smack/accesses. They take the form: |
| 79 | 79 | ||
diff --git a/Documentation/arm/SA1100/ADSBitsy b/Documentation/arm/SA1100/ADSBitsy index 7197a9e958ee..f9f62e8c0719 100644 --- a/Documentation/arm/SA1100/ADSBitsy +++ b/Documentation/arm/SA1100/ADSBitsy | |||
| @@ -32,7 +32,7 @@ Notes: | |||
| 32 | 32 | ||
| 33 | - The flash on board is divided into 3 partitions. | 33 | - The flash on board is divided into 3 partitions. |
| 34 | You should be careful to use flash on board. | 34 | You should be careful to use flash on board. |
| 35 | It's partition is different from GraphicsClient Plus and GraphicsMaster | 35 | Its partition is different from GraphicsClient Plus and GraphicsMaster |
| 36 | 36 | ||
| 37 | - 16bpp mode requires a different cable than what ships with the board. | 37 | - 16bpp mode requires a different cable than what ships with the board. |
| 38 | Contact ADS or look through the manual to wire your own. Currently, | 38 | Contact ADS or look through the manual to wire your own. Currently, |
diff --git a/Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen b/Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen index 1e6a23fdf2fc..dc460f055647 100644 --- a/Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen +++ b/Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen | |||
| @@ -7,7 +7,7 @@ The driver only implements a four-wire touch panel protocol. | |||
| 7 | 7 | ||
| 8 | The touchscreen driver is maintenance free except for the pen-down or | 8 | The touchscreen driver is maintenance free except for the pen-down or |
| 9 | touch threshold. Some resistive displays and board combinations may | 9 | touch threshold. Some resistive displays and board combinations may |
| 10 | require tuning of this threshold. The driver exposes some of it's | 10 | require tuning of this threshold. The driver exposes some of its |
| 11 | internal state in the sys filesystem. If the kernel is configured | 11 | internal state in the sys filesystem. If the kernel is configured |
| 12 | with it, CONFIG_SYSFS, and sysfs is mounted at /sys, there will be a | 12 | with it, CONFIG_SYSFS, and sysfs is mounted at /sys, there will be a |
| 13 | directory | 13 | directory |
diff --git a/Documentation/atomic_ops.txt b/Documentation/atomic_ops.txt index 396bec3b74ed..ac4d47187122 100644 --- a/Documentation/atomic_ops.txt +++ b/Documentation/atomic_ops.txt | |||
| @@ -320,7 +320,7 @@ counter decrement would not become globally visible until the | |||
| 320 | obj->active update does. | 320 | obj->active update does. |
| 321 | 321 | ||
| 322 | As a historical note, 32-bit Sparc used to only allow usage of | 322 | As a historical note, 32-bit Sparc used to only allow usage of |
| 323 | 24-bits of it's atomic_t type. This was because it used 8 bits | 323 | 24-bits of its atomic_t type. This was because it used 8 bits |
| 324 | as a spinlock for SMP safety. Sparc32 lacked a "compare and swap" | 324 | as a spinlock for SMP safety. Sparc32 lacked a "compare and swap" |
| 325 | type instruction. However, 32-bit Sparc has since been moved over | 325 | type instruction. However, 32-bit Sparc has since been moved over |
| 326 | to a "hash table of spinlocks" scheme, that allows the full 32-bit | 326 | to a "hash table of spinlocks" scheme, that allows the full 32-bit |
diff --git a/Documentation/blackfin/bfin-gpio-notes.txt b/Documentation/blackfin/bfin-gpio-notes.txt index 9898c7ded7d3..f731c1e56475 100644 --- a/Documentation/blackfin/bfin-gpio-notes.txt +++ b/Documentation/blackfin/bfin-gpio-notes.txt | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | void bfin_gpio_irq_free(unsigned gpio); | 43 | void bfin_gpio_irq_free(unsigned gpio); |
| 44 | 44 | ||
| 45 | The request functions will record the function state for a certain pin, | 45 | The request functions will record the function state for a certain pin, |
| 46 | the free functions will clear it's function state. | 46 | the free functions will clear its function state. |
| 47 | Once a pin is requested, it can't be requested again before it is freed by | 47 | Once a pin is requested, it can't be requested again before it is freed by |
| 48 | previous caller, otherwise kernel will dump stacks, and the request | 48 | previous caller, otherwise kernel will dump stacks, and the request |
| 49 | function fail. | 49 | function fail. |
diff --git a/Documentation/cachetlb.txt b/Documentation/cachetlb.txt index 2b5f823abd03..9164ae3b83bc 100644 --- a/Documentation/cachetlb.txt +++ b/Documentation/cachetlb.txt | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | This document describes the cache/tlb flushing interfaces called | 6 | This document describes the cache/tlb flushing interfaces called |
| 7 | by the Linux VM subsystem. It enumerates over each interface, | 7 | by the Linux VM subsystem. It enumerates over each interface, |
| 8 | describes it's intended purpose, and what side effect is expected | 8 | describes its intended purpose, and what side effect is expected |
| 9 | after the interface is invoked. | 9 | after the interface is invoked. |
| 10 | 10 | ||
| 11 | The side effects described below are stated for a uniprocessor | 11 | The side effects described below are stated for a uniprocessor |
| @@ -231,7 +231,7 @@ require a whole different set of interfaces to handle properly. | |||
| 231 | The biggest problem is that of virtual aliasing in the data cache | 231 | The biggest problem is that of virtual aliasing in the data cache |
| 232 | of a processor. | 232 | of a processor. |
| 233 | 233 | ||
| 234 | Is your port susceptible to virtual aliasing in it's D-cache? | 234 | Is your port susceptible to virtual aliasing in its D-cache? |
| 235 | Well, if your D-cache is virtually indexed, is larger in size than | 235 | Well, if your D-cache is virtually indexed, is larger in size than |
| 236 | PAGE_SIZE, and does not prevent multiple cache lines for the same | 236 | PAGE_SIZE, and does not prevent multiple cache lines for the same |
| 237 | physical address from existing at once, you have this problem. | 237 | physical address from existing at once, you have this problem. |
| @@ -249,7 +249,7 @@ one way to solve this (in particular SPARC_FLAG_MMAPSHARED). | |||
| 249 | Next, you have to solve the D-cache aliasing issue for all | 249 | Next, you have to solve the D-cache aliasing issue for all |
| 250 | other cases. Please keep in mind that fact that, for a given page | 250 | other cases. Please keep in mind that fact that, for a given page |
| 251 | mapped into some user address space, there is always at least one more | 251 | mapped into some user address space, there is always at least one more |
| 252 | mapping, that of the kernel in it's linear mapping starting at | 252 | mapping, that of the kernel in its linear mapping starting at |
| 253 | PAGE_OFFSET. So immediately, once the first user maps a given | 253 | PAGE_OFFSET. So immediately, once the first user maps a given |
| 254 | physical page into its address space, by implication the D-cache | 254 | physical page into its address space, by implication the D-cache |
| 255 | aliasing problem has the potential to exist since the kernel already | 255 | aliasing problem has the potential to exist since the kernel already |
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt index a1ca5924faff..57444c2609fc 100644 --- a/Documentation/cgroups/cgroups.txt +++ b/Documentation/cgroups/cgroups.txt | |||
| @@ -572,7 +572,7 @@ void cancel_attach(struct cgroup_subsys *ss, struct cgroup *cgrp, | |||
| 572 | 572 | ||
| 573 | Called when a task attach operation has failed after can_attach() has succeeded. | 573 | Called when a task attach operation has failed after can_attach() has succeeded. |
| 574 | A subsystem whose can_attach() has some side-effects should provide this | 574 | A subsystem whose can_attach() has some side-effects should provide this |
| 575 | function, so that the subsytem can implement a rollback. If not, not necessary. | 575 | function, so that the subsystem can implement a rollback. If not, not necessary. |
| 576 | This will be called only about subsystems whose can_attach() operation have | 576 | This will be called only about subsystems whose can_attach() operation have |
| 577 | succeeded. | 577 | succeeded. |
| 578 | 578 | ||
diff --git a/Documentation/cgroups/cpusets.txt b/Documentation/cgroups/cpusets.txt index 4160df82b3f5..51682ab2dd1a 100644 --- a/Documentation/cgroups/cpusets.txt +++ b/Documentation/cgroups/cpusets.txt | |||
| @@ -42,7 +42,7 @@ Nodes to a set of tasks. In this document "Memory Node" refers to | |||
| 42 | an on-line node that contains memory. | 42 | an on-line node that contains memory. |
| 43 | 43 | ||
| 44 | Cpusets constrain the CPU and Memory placement of tasks to only | 44 | Cpusets constrain the CPU and Memory placement of tasks to only |
| 45 | the resources within a tasks current cpuset. They form a nested | 45 | the resources within a task's current cpuset. They form a nested |
| 46 | hierarchy visible in a virtual file system. These are the essential | 46 | hierarchy visible in a virtual file system. These are the essential |
| 47 | hooks, beyond what is already present, required to manage dynamic | 47 | hooks, beyond what is already present, required to manage dynamic |
| 48 | job placement on large systems. | 48 | job placement on large systems. |
| @@ -53,11 +53,11 @@ Documentation/cgroups/cgroups.txt. | |||
| 53 | Requests by a task, using the sched_setaffinity(2) system call to | 53 | Requests by a task, using the sched_setaffinity(2) system call to |
| 54 | include CPUs in its CPU affinity mask, and using the mbind(2) and | 54 | include CPUs in its CPU affinity mask, and using the mbind(2) and |
| 55 | set_mempolicy(2) system calls to include Memory Nodes in its memory | 55 | set_mempolicy(2) system calls to include Memory Nodes in its memory |
| 56 | policy, are both filtered through that tasks cpuset, filtering out any | 56 | policy, are both filtered through that task's cpuset, filtering out any |
| 57 | CPUs or Memory Nodes not in that cpuset. The scheduler will not | 57 | CPUs or Memory Nodes not in that cpuset. The scheduler will not |
| 58 | schedule a task on a CPU that is not allowed in its cpus_allowed | 58 | schedule a task on a CPU that is not allowed in its cpus_allowed |
| 59 | vector, and the kernel page allocator will not allocate a page on a | 59 | vector, and the kernel page allocator will not allocate a page on a |
| 60 | node that is not allowed in the requesting tasks mems_allowed vector. | 60 | node that is not allowed in the requesting task's mems_allowed vector. |
| 61 | 61 | ||
| 62 | User level code may create and destroy cpusets by name in the cgroup | 62 | User level code may create and destroy cpusets by name in the cgroup |
| 63 | virtual file system, manage the attributes and permissions of these | 63 | virtual file system, manage the attributes and permissions of these |
| @@ -121,9 +121,9 @@ Cpusets extends these two mechanisms as follows: | |||
| 121 | - Each task in the system is attached to a cpuset, via a pointer | 121 | - Each task in the system is attached to a cpuset, via a pointer |
| 122 | in the task structure to a reference counted cgroup structure. | 122 | in the task structure to a reference counted cgroup structure. |
| 123 | - Calls to sched_setaffinity are filtered to just those CPUs | 123 | - Calls to sched_setaffinity are filtered to just those CPUs |
| 124 | allowed in that tasks cpuset. | 124 | allowed in that task's cpuset. |
| 125 | - Calls to mbind and set_mempolicy are filtered to just | 125 | - Calls to mbind and set_mempolicy are filtered to just |
| 126 | those Memory Nodes allowed in that tasks cpuset. | 126 | those Memory Nodes allowed in that task's cpuset. |
| 127 | - The root cpuset contains all the systems CPUs and Memory | 127 | - The root cpuset contains all the systems CPUs and Memory |
| 128 | Nodes. | 128 | Nodes. |
| 129 | - For any cpuset, one can define child cpusets containing a subset | 129 | - For any cpuset, one can define child cpusets containing a subset |
| @@ -141,11 +141,11 @@ into the rest of the kernel, none in performance critical paths: | |||
| 141 | - in init/main.c, to initialize the root cpuset at system boot. | 141 | - in init/main.c, to initialize the root cpuset at system boot. |
| 142 | - in fork and exit, to attach and detach a task from its cpuset. | 142 | - in fork and exit, to attach and detach a task from its cpuset. |
| 143 | - in sched_setaffinity, to mask the requested CPUs by what's | 143 | - in sched_setaffinity, to mask the requested CPUs by what's |
| 144 | allowed in that tasks cpuset. | 144 | allowed in that task's cpuset. |
| 145 | - in sched.c migrate_live_tasks(), to keep migrating tasks within | 145 | - in sched.c migrate_live_tasks(), to keep migrating tasks within |
| 146 | the CPUs allowed by their cpuset, if possible. | 146 | the CPUs allowed by their cpuset, if possible. |
| 147 | - in the mbind and set_mempolicy system calls, to mask the requested | 147 | - in the mbind and set_mempolicy system calls, to mask the requested |
| 148 | Memory Nodes by what's allowed in that tasks cpuset. | 148 | Memory Nodes by what's allowed in that task's cpuset. |
| 149 | - in page_alloc.c, to restrict memory to allowed nodes. | 149 | - in page_alloc.c, to restrict memory to allowed nodes. |
| 150 | - in vmscan.c, to restrict page recovery to the current cpuset. | 150 | - in vmscan.c, to restrict page recovery to the current cpuset. |
| 151 | 151 | ||
| @@ -155,7 +155,7 @@ new system calls are added for cpusets - all support for querying and | |||
| 155 | modifying cpusets is via this cpuset file system. | 155 | modifying cpusets is via this cpuset file system. |
| 156 | 156 | ||
| 157 | The /proc/<pid>/status file for each task has four added lines, | 157 | The /proc/<pid>/status file for each task has four added lines, |
| 158 | displaying the tasks cpus_allowed (on which CPUs it may be scheduled) | 158 | displaying the task's cpus_allowed (on which CPUs it may be scheduled) |
| 159 | and mems_allowed (on which Memory Nodes it may obtain memory), | 159 | and mems_allowed (on which Memory Nodes it may obtain memory), |
| 160 | in the two formats seen in the following example: | 160 | in the two formats seen in the following example: |
| 161 | 161 | ||
| @@ -323,17 +323,17 @@ stack segment pages of a task. | |||
| 323 | 323 | ||
| 324 | By default, both kinds of memory spreading are off, and memory | 324 | By default, both kinds of memory spreading are off, and memory |
| 325 | pages are allocated on the node local to where the task is running, | 325 | pages are allocated on the node local to where the task is running, |
| 326 | except perhaps as modified by the tasks NUMA mempolicy or cpuset | 326 | except perhaps as modified by the task's NUMA mempolicy or cpuset |
| 327 | configuration, so long as sufficient free memory pages are available. | 327 | configuration, so long as sufficient free memory pages are available. |
| 328 | 328 | ||
| 329 | When new cpusets are created, they inherit the memory spread settings | 329 | When new cpusets are created, they inherit the memory spread settings |
| 330 | of their parent. | 330 | of their parent. |
| 331 | 331 | ||
| 332 | Setting memory spreading causes allocations for the affected page | 332 | Setting memory spreading causes allocations for the affected page |
| 333 | or slab caches to ignore the tasks NUMA mempolicy and be spread | 333 | or slab caches to ignore the task's NUMA mempolicy and be spread |
| 334 | instead. Tasks using mbind() or set_mempolicy() calls to set NUMA | 334 | instead. Tasks using mbind() or set_mempolicy() calls to set NUMA |
| 335 | mempolicies will not notice any change in these calls as a result of | 335 | mempolicies will not notice any change in these calls as a result of |
| 336 | their containing tasks memory spread settings. If memory spreading | 336 | their containing task's memory spread settings. If memory spreading |
| 337 | is turned off, then the currently specified NUMA mempolicy once again | 337 | is turned off, then the currently specified NUMA mempolicy once again |
| 338 | applies to memory page allocations. | 338 | applies to memory page allocations. |
| 339 | 339 | ||
| @@ -357,7 +357,7 @@ pages from the node returned by cpuset_mem_spread_node(). | |||
| 357 | 357 | ||
| 358 | The cpuset_mem_spread_node() routine is also simple. It uses the | 358 | The cpuset_mem_spread_node() routine is also simple. It uses the |
| 359 | value of a per-task rotor cpuset_mem_spread_rotor to select the next | 359 | value of a per-task rotor cpuset_mem_spread_rotor to select the next |
| 360 | node in the current tasks mems_allowed to prefer for the allocation. | 360 | node in the current task's mems_allowed to prefer for the allocation. |
| 361 | 361 | ||
| 362 | This memory placement policy is also known (in other contexts) as | 362 | This memory placement policy is also known (in other contexts) as |
| 363 | round-robin or interleave. | 363 | round-robin or interleave. |
| @@ -594,7 +594,7 @@ is attached, is subtle. | |||
| 594 | If a cpuset has its Memory Nodes modified, then for each task attached | 594 | If a cpuset has its Memory Nodes modified, then for each task attached |
| 595 | to that cpuset, the next time that the kernel attempts to allocate | 595 | to that cpuset, the next time that the kernel attempts to allocate |
| 596 | a page of memory for that task, the kernel will notice the change | 596 | a page of memory for that task, the kernel will notice the change |
| 597 | in the tasks cpuset, and update its per-task memory placement to | 597 | in the task's cpuset, and update its per-task memory placement to |
| 598 | remain within the new cpusets memory placement. If the task was using | 598 | remain within the new cpusets memory placement. If the task was using |
| 599 | mempolicy MPOL_BIND, and the nodes to which it was bound overlap with | 599 | mempolicy MPOL_BIND, and the nodes to which it was bound overlap with |
| 600 | its new cpuset, then the task will continue to use whatever subset | 600 | its new cpuset, then the task will continue to use whatever subset |
| @@ -603,13 +603,13 @@ was using MPOL_BIND and now none of its MPOL_BIND nodes are allowed | |||
| 603 | in the new cpuset, then the task will be essentially treated as if it | 603 | in the new cpuset, then the task will be essentially treated as if it |
| 604 | was MPOL_BIND bound to the new cpuset (even though its NUMA placement, | 604 | was MPOL_BIND bound to the new cpuset (even though its NUMA placement, |
| 605 | as queried by get_mempolicy(), doesn't change). If a task is moved | 605 | as queried by get_mempolicy(), doesn't change). If a task is moved |
| 606 | from one cpuset to another, then the kernel will adjust the tasks | 606 | from one cpuset to another, then the kernel will adjust the task's |
| 607 | memory placement, as above, the next time that the kernel attempts | 607 | memory placement, as above, the next time that the kernel attempts |
| 608 | to allocate a page of memory for that task. | 608 | to allocate a page of memory for that task. |
| 609 | 609 | ||
| 610 | If a cpuset has its 'cpuset.cpus' modified, then each task in that cpuset | 610 | If a cpuset has its 'cpuset.cpus' modified, then each task in that cpuset |
| 611 | will have its allowed CPU placement changed immediately. Similarly, | 611 | will have its allowed CPU placement changed immediately. Similarly, |
| 612 | if a tasks pid is written to another cpusets 'cpuset.tasks' file, then its | 612 | if a task's pid is written to another cpusets 'cpuset.tasks' file, then its |
| 613 | allowed CPU placement is changed immediately. If such a task had been | 613 | allowed CPU placement is changed immediately. If such a task had been |
| 614 | bound to some subset of its cpuset using the sched_setaffinity() call, | 614 | bound to some subset of its cpuset using the sched_setaffinity() call, |
| 615 | the task will be allowed to run on any CPU allowed in its new cpuset, | 615 | the task will be allowed to run on any CPU allowed in its new cpuset, |
| @@ -626,16 +626,16 @@ cpusets memory placement policy 'cpuset.mems' subsequently changes. | |||
| 626 | If the cpuset flag file 'cpuset.memory_migrate' is set true, then when | 626 | If the cpuset flag file 'cpuset.memory_migrate' is set true, then when |
| 627 | tasks are attached to that cpuset, any pages that task had | 627 | tasks are attached to that cpuset, any pages that task had |
| 628 | allocated to it on nodes in its previous cpuset are migrated | 628 | allocated to it on nodes in its previous cpuset are migrated |
| 629 | to the tasks new cpuset. The relative placement of the page within | 629 | to the task's new cpuset. The relative placement of the page within |
| 630 | the cpuset is preserved during these migration operations if possible. | 630 | the cpuset is preserved during these migration operations if possible. |
| 631 | For example if the page was on the second valid node of the prior cpuset | 631 | For example if the page was on the second valid node of the prior cpuset |
| 632 | then the page will be placed on the second valid node of the new cpuset. | 632 | then the page will be placed on the second valid node of the new cpuset. |
| 633 | 633 | ||
| 634 | Also if 'cpuset.memory_migrate' is set true, then if that cpusets | 634 | Also if 'cpuset.memory_migrate' is set true, then if that cpuset's |
| 635 | 'cpuset.mems' file is modified, pages allocated to tasks in that | 635 | 'cpuset.mems' file is modified, pages allocated to tasks in that |
| 636 | cpuset, that were on nodes in the previous setting of 'cpuset.mems', | 636 | cpuset, that were on nodes in the previous setting of 'cpuset.mems', |
| 637 | will be moved to nodes in the new setting of 'mems.' | 637 | will be moved to nodes in the new setting of 'mems.' |
| 638 | Pages that were not in the tasks prior cpuset, or in the cpusets | 638 | Pages that were not in the task's prior cpuset, or in the cpuset's |
| 639 | prior 'cpuset.mems' setting, will not be moved. | 639 | prior 'cpuset.mems' setting, will not be moved. |
| 640 | 640 | ||
| 641 | There is an exception to the above. If hotplug functionality is used | 641 | There is an exception to the above. If hotplug functionality is used |
| @@ -655,7 +655,7 @@ There is a second exception to the above. GFP_ATOMIC requests are | |||
| 655 | kernel internal allocations that must be satisfied, immediately. | 655 | kernel internal allocations that must be satisfied, immediately. |
| 656 | The kernel may drop some request, in rare cases even panic, if a | 656 | The kernel may drop some request, in rare cases even panic, if a |
| 657 | GFP_ATOMIC alloc fails. If the request cannot be satisfied within | 657 | GFP_ATOMIC alloc fails. If the request cannot be satisfied within |
| 658 | the current tasks cpuset, then we relax the cpuset, and look for | 658 | the current task's cpuset, then we relax the cpuset, and look for |
| 659 | memory anywhere we can find it. It's better to violate the cpuset | 659 | memory anywhere we can find it. It's better to violate the cpuset |
| 660 | than stress the kernel. | 660 | than stress the kernel. |
| 661 | 661 | ||
diff --git a/Documentation/cgroups/memcg_test.txt b/Documentation/cgroups/memcg_test.txt index f7f68b2ac199..b7eececfb195 100644 --- a/Documentation/cgroups/memcg_test.txt +++ b/Documentation/cgroups/memcg_test.txt | |||
| @@ -244,7 +244,7 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y. | |||
| 244 | we have to check if OLDPAGE/NEWPAGE is a valid page after commit(). | 244 | we have to check if OLDPAGE/NEWPAGE is a valid page after commit(). |
| 245 | 245 | ||
| 246 | 8. LRU | 246 | 8. LRU |
| 247 | Each memcg has its own private LRU. Now, it's handling is under global | 247 | Each memcg has its own private LRU. Now, its handling is under global |
| 248 | VM's control (means that it's handled under global zone->lru_lock). | 248 | VM's control (means that it's handled under global zone->lru_lock). |
| 249 | Almost all routines around memcg's LRU is called by global LRU's | 249 | Almost all routines around memcg's LRU is called by global LRU's |
| 250 | list management functions under zone->lru_lock(). | 250 | list management functions under zone->lru_lock(). |
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 3a6aecd078ba..6cab1f29da4c 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt | |||
| @@ -263,7 +263,7 @@ some of the pages cached in the cgroup (page cache pages). | |||
| 263 | 263 | ||
| 264 | 4.2 Task migration | 264 | 4.2 Task migration |
| 265 | 265 | ||
| 266 | When a task migrates from one cgroup to another, it's charge is not | 266 | When a task migrates from one cgroup to another, its charge is not |
| 267 | carried forward by default. The pages allocated from the original cgroup still | 267 | carried forward by default. The pages allocated from the original cgroup still |
| 268 | remain charged to it, the charge is dropped when the page is freed or | 268 | remain charged to it, the charge is dropped when the page is freed or |
| 269 | reclaimed. | 269 | reclaimed. |
diff --git a/Documentation/connector/connector.txt b/Documentation/connector/connector.txt index 78c9466a9aa8..e5c5f5e6ab70 100644 --- a/Documentation/connector/connector.txt +++ b/Documentation/connector/connector.txt | |||
| @@ -88,7 +88,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask); | |||
| 88 | int gfp_mask - GFP mask. | 88 | int gfp_mask - GFP mask. |
| 89 | 89 | ||
| 90 | Note: When registering new callback user, connector core assigns | 90 | Note: When registering new callback user, connector core assigns |
| 91 | netlink group to the user which is equal to it's id.idx. | 91 | netlink group to the user which is equal to its id.idx. |
| 92 | 92 | ||
| 93 | /*****************************************/ | 93 | /*****************************************/ |
| 94 | Protocol description. | 94 | Protocol description. |
diff --git a/Documentation/dvb/ci.txt b/Documentation/dvb/ci.txt index 2ecd834585e6..4a0c2b56e690 100644 --- a/Documentation/dvb/ci.txt +++ b/Documentation/dvb/ci.txt | |||
| @@ -41,7 +41,7 @@ This application requires the following to function properly as of now. | |||
| 41 | 41 | ||
| 42 | * Cards that fall in this category | 42 | * Cards that fall in this category |
| 43 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 43 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 44 | At present the cards that fall in this category are the Twinhan and it's | 44 | At present the cards that fall in this category are the Twinhan and its |
| 45 | clones, these cards are available as VVMER, Tomato, Hercules, Orange and | 45 | clones, these cards are available as VVMER, Tomato, Hercules, Orange and |
| 46 | so on. | 46 | so on. |
| 47 | 47 | ||
diff --git a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt index 4865addebe1c..47c30098dab6 100644 --- a/Documentation/dvb/contributors.txt +++ b/Documentation/dvb/contributors.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | Thanks go to the following people for patches and contributions: | 1 | Thanks go to the following people for patches and contributions: |
| 2 | 2 | ||
| 3 | Michael Hunold <m.hunold@gmx.de> | 3 | Michael Hunold <m.hunold@gmx.de> |
| 4 | for the initial saa7146 driver and it's recent overhaul | 4 | for the initial saa7146 driver and its recent overhaul |
| 5 | 5 | ||
| 6 | Christian Theiss | 6 | Christian Theiss |
| 7 | for his work on the initial Linux DVB driver | 7 | for his work on the initial Linux DVB driver |
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 06bbbed71206..af1608070cd5 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
| @@ -178,7 +178,7 @@ prototypes: | |||
| 178 | locking rules: | 178 | locking rules: |
| 179 | All except set_page_dirty may block | 179 | All except set_page_dirty may block |
| 180 | 180 | ||
| 181 | BKL PageLocked(page) i_sem | 181 | BKL PageLocked(page) i_mutex |
| 182 | writepage: no yes, unlocks (see below) | 182 | writepage: no yes, unlocks (see below) |
| 183 | readpage: no yes, unlocks | 183 | readpage: no yes, unlocks |
| 184 | sync_page: no maybe | 184 | sync_page: no maybe |
| @@ -429,7 +429,7 @@ check_flags: no | |||
| 429 | implementations. If your fs is not using generic_file_llseek, you | 429 | implementations. If your fs is not using generic_file_llseek, you |
| 430 | need to acquire and release the appropriate locks in your ->llseek(). | 430 | need to acquire and release the appropriate locks in your ->llseek(). |
| 431 | For many filesystems, it is probably safe to acquire the inode | 431 | For many filesystems, it is probably safe to acquire the inode |
| 432 | semaphore. Note some filesystems (i.e. remote ones) provide no | 432 | mutex. Note some filesystems (i.e. remote ones) provide no |
| 433 | protection for i_size so you will need to use the BKL. | 433 | protection for i_size so you will need to use the BKL. |
| 434 | 434 | ||
| 435 | Note: ext2_release() was *the* source of contention on fs-intensive | 435 | Note: ext2_release() was *the* source of contention on fs-intensive |
diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt index 8f78ded4b648..51986bf08a4d 100644 --- a/Documentation/filesystems/autofs4-mount-control.txt +++ b/Documentation/filesystems/autofs4-mount-control.txt | |||
| @@ -146,7 +146,7 @@ found to be inadequate, in this case. The Generic Netlink system was | |||
| 146 | used for this as raw Netlink would lead to a significant increase in | 146 | used for this as raw Netlink would lead to a significant increase in |
| 147 | complexity. There's no question that the Generic Netlink system is an | 147 | complexity. There's no question that the Generic Netlink system is an |
| 148 | elegant solution for common case ioctl functions but it's not a complete | 148 | elegant solution for common case ioctl functions but it's not a complete |
| 149 | replacement probably because it's primary purpose in life is to be a | 149 | replacement probably because its primary purpose in life is to be a |
| 150 | message bus implementation rather than specifically an ioctl replacement. | 150 | message bus implementation rather than specifically an ioctl replacement. |
| 151 | While it would be possible to work around this there is one concern | 151 | While it would be possible to work around this there is one concern |
| 152 | that lead to the decision to not use it. This is that the autofs | 152 | that lead to the decision to not use it. This is that the autofs |
diff --git a/Documentation/filesystems/ceph.txt b/Documentation/filesystems/ceph.txt index 0660c9f5deef..763d8ebbbebd 100644 --- a/Documentation/filesystems/ceph.txt +++ b/Documentation/filesystems/ceph.txt | |||
| @@ -90,7 +90,7 @@ Mount Options | |||
| 90 | Specify the IP and/or port the client should bind to locally. | 90 | Specify the IP and/or port the client should bind to locally. |
| 91 | There is normally not much reason to do this. If the IP is not | 91 | There is normally not much reason to do this. If the IP is not |
| 92 | specified, the client's IP address is determined by looking at the | 92 | specified, the client's IP address is determined by looking at the |
| 93 | address it's connection to the monitor originates from. | 93 | address its connection to the monitor originates from. |
| 94 | 94 | ||
| 95 | wsize=X | 95 | wsize=X |
| 96 | Specify the maximum write size in bytes. By default there is no | 96 | Specify the maximum write size in bytes. By default there is no |
diff --git a/Documentation/filesystems/dlmfs.txt b/Documentation/filesystems/dlmfs.txt index c50bbb2d52b4..1b528b2ad809 100644 --- a/Documentation/filesystems/dlmfs.txt +++ b/Documentation/filesystems/dlmfs.txt | |||
| @@ -47,7 +47,7 @@ You'll want to start heartbeating on a volume which all the nodes in | |||
| 47 | your lockspace can access. The easiest way to do this is via | 47 | your lockspace can access. The easiest way to do this is via |
| 48 | ocfs2_hb_ctl (distributed with ocfs2-tools). Right now it requires | 48 | ocfs2_hb_ctl (distributed with ocfs2-tools). Right now it requires |
| 49 | that an OCFS2 file system be in place so that it can automatically | 49 | that an OCFS2 file system be in place so that it can automatically |
| 50 | find it's heartbeat area, though it will eventually support heartbeat | 50 | find its heartbeat area, though it will eventually support heartbeat |
| 51 | against raw disks. | 51 | against raw disks. |
| 52 | 52 | ||
| 53 | Please see the ocfs2_hb_ctl and mkfs.ocfs2 manual pages distributed | 53 | Please see the ocfs2_hb_ctl and mkfs.ocfs2 manual pages distributed |
diff --git a/Documentation/filesystems/fiemap.txt b/Documentation/filesystems/fiemap.txt index 606233cd4618..1b805a0efbb0 100644 --- a/Documentation/filesystems/fiemap.txt +++ b/Documentation/filesystems/fiemap.txt | |||
| @@ -38,7 +38,7 @@ flags, it will return EBADR and the contents of fm_flags will contain | |||
| 38 | the set of flags which caused the error. If the kernel is compatible | 38 | the set of flags which caused the error. If the kernel is compatible |
| 39 | with all flags passed, the contents of fm_flags will be unmodified. | 39 | with all flags passed, the contents of fm_flags will be unmodified. |
| 40 | It is up to userspace to determine whether rejection of a particular | 40 | It is up to userspace to determine whether rejection of a particular |
| 41 | flag is fatal to it's operation. This scheme is intended to allow the | 41 | flag is fatal to its operation. This scheme is intended to allow the |
| 42 | fiemap interface to grow in the future but without losing | 42 | fiemap interface to grow in the future but without losing |
| 43 | compatibility with old software. | 43 | compatibility with old software. |
| 44 | 44 | ||
| @@ -56,7 +56,7 @@ If this flag is set, the kernel will sync the file before mapping extents. | |||
| 56 | 56 | ||
| 57 | * FIEMAP_FLAG_XATTR | 57 | * FIEMAP_FLAG_XATTR |
| 58 | If this flag is set, the extents returned will describe the inodes | 58 | If this flag is set, the extents returned will describe the inodes |
| 59 | extended attribute lookup tree, instead of it's data tree. | 59 | extended attribute lookup tree, instead of its data tree. |
| 60 | 60 | ||
| 61 | 61 | ||
| 62 | Extent Mapping | 62 | Extent Mapping |
| @@ -89,7 +89,7 @@ struct fiemap_extent { | |||
| 89 | }; | 89 | }; |
| 90 | 90 | ||
| 91 | All offsets and lengths are in bytes and mirror those on disk. It is valid | 91 | All offsets and lengths are in bytes and mirror those on disk. It is valid |
| 92 | for an extents logical offset to start before the request or it's logical | 92 | for an extents logical offset to start before the request or its logical |
| 93 | length to extend past the request. Unless FIEMAP_EXTENT_NOT_ALIGNED is | 93 | length to extend past the request. Unless FIEMAP_EXTENT_NOT_ALIGNED is |
| 94 | returned, fe_logical, fe_physical, and fe_length will be aligned to the | 94 | returned, fe_logical, fe_physical, and fe_length will be aligned to the |
| 95 | block size of the file system. With the exception of extents flagged as | 95 | block size of the file system. With the exception of extents flagged as |
| @@ -125,7 +125,7 @@ been allocated for the file yet. | |||
| 125 | 125 | ||
| 126 | * FIEMAP_EXTENT_DELALLOC | 126 | * FIEMAP_EXTENT_DELALLOC |
| 127 | - This will also set FIEMAP_EXTENT_UNKNOWN. | 127 | - This will also set FIEMAP_EXTENT_UNKNOWN. |
| 128 | Delayed allocation - while there is data for this extent, it's | 128 | Delayed allocation - while there is data for this extent, its |
| 129 | physical location has not been allocated yet. | 129 | physical location has not been allocated yet. |
| 130 | 130 | ||
| 131 | * FIEMAP_EXTENT_ENCODED | 131 | * FIEMAP_EXTENT_ENCODED |
| @@ -159,7 +159,7 @@ Data is located within a meta data block. | |||
| 159 | Data is packed into a block with data from other files. | 159 | Data is packed into a block with data from other files. |
| 160 | 160 | ||
| 161 | * FIEMAP_EXTENT_UNWRITTEN | 161 | * FIEMAP_EXTENT_UNWRITTEN |
| 162 | Unwritten extent - the extent is allocated but it's data has not been | 162 | Unwritten extent - the extent is allocated but its data has not been |
| 163 | initialized. This indicates the extent's data will be all zero if read | 163 | initialized. This indicates the extent's data will be all zero if read |
| 164 | through the filesystem but the contents are undefined if read directly from | 164 | through the filesystem but the contents are undefined if read directly from |
| 165 | the device. | 165 | the device. |
| @@ -176,7 +176,7 @@ VFS -> File System Implementation | |||
| 176 | 176 | ||
| 177 | File systems wishing to support fiemap must implement a ->fiemap callback on | 177 | File systems wishing to support fiemap must implement a ->fiemap callback on |
| 178 | their inode_operations structure. The fs ->fiemap call is responsible for | 178 | their inode_operations structure. The fs ->fiemap call is responsible for |
| 179 | defining it's set of supported fiemap flags, and calling a helper function on | 179 | defining its set of supported fiemap flags, and calling a helper function on |
| 180 | each discovered extent: | 180 | each discovered extent: |
| 181 | 181 | ||
| 182 | struct inode_operations { | 182 | struct inode_operations { |
diff --git a/Documentation/filesystems/fuse.txt b/Documentation/filesystems/fuse.txt index 397a41adb4c3..13af4a49e7db 100644 --- a/Documentation/filesystems/fuse.txt +++ b/Documentation/filesystems/fuse.txt | |||
| @@ -91,7 +91,7 @@ Mount options | |||
| 91 | 'default_permissions' | 91 | 'default_permissions' |
| 92 | 92 | ||
| 93 | By default FUSE doesn't check file access permissions, the | 93 | By default FUSE doesn't check file access permissions, the |
| 94 | filesystem is free to implement it's access policy or leave it to | 94 | filesystem is free to implement its access policy or leave it to |
| 95 | the underlying file access mechanism (e.g. in case of network | 95 | the underlying file access mechanism (e.g. in case of network |
| 96 | filesystems). This option enables permission checking, restricting | 96 | filesystems). This option enables permission checking, restricting |
| 97 | access based on file mode. It is usually useful together with the | 97 | access based on file mode. It is usually useful together with the |
| @@ -171,7 +171,7 @@ or may honor them by sending a reply to the _original_ request, with | |||
| 171 | the error set to EINTR. | 171 | the error set to EINTR. |
| 172 | 172 | ||
| 173 | It is also possible that there's a race between processing the | 173 | It is also possible that there's a race between processing the |
| 174 | original request and it's INTERRUPT request. There are two possibilities: | 174 | original request and its INTERRUPT request. There are two possibilities: |
| 175 | 175 | ||
| 176 | 1) The INTERRUPT request is processed before the original request is | 176 | 1) The INTERRUPT request is processed before the original request is |
| 177 | processed | 177 | processed |
diff --git a/Documentation/filesystems/hpfs.txt b/Documentation/filesystems/hpfs.txt index fa45c3baed98..74630bd504fb 100644 --- a/Documentation/filesystems/hpfs.txt +++ b/Documentation/filesystems/hpfs.txt | |||
| @@ -103,7 +103,7 @@ to analyze or change OS2SYS.INI. | |||
| 103 | Codepages | 103 | Codepages |
| 104 | 104 | ||
| 105 | HPFS can contain several uppercasing tables for several codepages and each | 105 | HPFS can contain several uppercasing tables for several codepages and each |
| 106 | file has a pointer to codepage it's name is in. However OS/2 was created in | 106 | file has a pointer to codepage its name is in. However OS/2 was created in |
| 107 | America where people don't care much about codepages and so multiple codepages | 107 | America where people don't care much about codepages and so multiple codepages |
| 108 | support is quite buggy. I have Czech OS/2 working in codepage 852 on my disk. | 108 | support is quite buggy. I have Czech OS/2 working in codepage 852 on my disk. |
| 109 | Once I booted English OS/2 working in cp 850 and I created a file on my 852 | 109 | Once I booted English OS/2 working in cp 850 and I created a file on my 852 |
diff --git a/Documentation/filesystems/logfs.txt b/Documentation/filesystems/logfs.txt index e64c94ba401a..bca42c22a143 100644 --- a/Documentation/filesystems/logfs.txt +++ b/Documentation/filesystems/logfs.txt | |||
| @@ -59,7 +59,7 @@ Levels | |||
| 59 | ------ | 59 | ------ |
| 60 | 60 | ||
| 61 | Garbage collection (GC) may fail if all data is written | 61 | Garbage collection (GC) may fail if all data is written |
| 62 | indiscriminately. One requirement of GC is that data is seperated | 62 | indiscriminately. One requirement of GC is that data is separated |
| 63 | roughly according to the distance between the tree root and the data. | 63 | roughly according to the distance between the tree root and the data. |
| 64 | Effectively that means all file data is on level 0, indirect blocks | 64 | Effectively that means all file data is on level 0, indirect blocks |
| 65 | are on levels 1, 2, 3 4 or 5 for 1x, 2x, 3x, 4x or 5x indirect blocks, | 65 | are on levels 1, 2, 3 4 or 5 for 1x, 2x, 3x, 4x or 5x indirect blocks, |
| @@ -67,7 +67,7 @@ respectively. Inode file data is on level 6 for the inodes and 7-11 | |||
| 67 | for indirect blocks. | 67 | for indirect blocks. |
| 68 | 68 | ||
| 69 | Each segment contains objects of a single level only. As a result, | 69 | Each segment contains objects of a single level only. As a result, |
| 70 | each level requires its own seperate segment to be open for writing. | 70 | each level requires its own separate segment to be open for writing. |
| 71 | 71 | ||
| 72 | Inode File | 72 | Inode File |
| 73 | ---------- | 73 | ---------- |
| @@ -106,9 +106,9 @@ Vim | |||
| 106 | --- | 106 | --- |
| 107 | 107 | ||
| 108 | By cleverly predicting the life time of data, it is possible to | 108 | By cleverly predicting the life time of data, it is possible to |
| 109 | seperate long-living data from short-living data and thereby reduce | 109 | separate long-living data from short-living data and thereby reduce |
| 110 | the GC overhead later. Each type of distinc life expectency (vim) can | 110 | the GC overhead later. Each type of distinc life expectency (vim) can |
| 111 | have a seperate segment open for writing. Each (level, vim) tupel can | 111 | have a separate segment open for writing. Each (level, vim) tupel can |
| 112 | be open just once. If an open segment with unknown vim is encountered | 112 | be open just once. If an open segment with unknown vim is encountered |
| 113 | at mount time, it is closed and ignored henceforth. | 113 | at mount time, it is closed and ignored henceforth. |
| 114 | 114 | ||
diff --git a/Documentation/filesystems/nfs/rpc-cache.txt b/Documentation/filesystems/nfs/rpc-cache.txt index 8a382bea6808..ebcaaee21616 100644 --- a/Documentation/filesystems/nfs/rpc-cache.txt +++ b/Documentation/filesystems/nfs/rpc-cache.txt | |||
| @@ -185,7 +185,7 @@ failed lookup meant a definite 'no'. | |||
| 185 | request/response format | 185 | request/response format |
| 186 | ----------------------- | 186 | ----------------------- |
| 187 | 187 | ||
| 188 | While each cache is free to use it's own format for requests | 188 | While each cache is free to use its own format for requests |
| 189 | and responses over channel, the following is recommended as | 189 | and responses over channel, the following is recommended as |
| 190 | appropriate and support routines are available to help: | 190 | appropriate and support routines are available to help: |
| 191 | Each request or response record should be printable ASCII | 191 | Each request or response record should be printable ASCII |
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index fbce915c9181..9fb6cbe70bde 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -305,7 +305,7 @@ Table 1-4: Contents of the stat files (as of 2.6.30-rc7) | |||
| 305 | cgtime guest time of the task children in jiffies | 305 | cgtime guest time of the task children in jiffies |
| 306 | .............................................................................. | 306 | .............................................................................. |
| 307 | 307 | ||
| 308 | The /proc/PID/map file containing the currently mapped memory regions and | 308 | The /proc/PID/maps file containing the currently mapped memory regions and |
| 309 | their access permissions. | 309 | their access permissions. |
| 310 | 310 | ||
| 311 | The format is: | 311 | The format is: |
| @@ -968,7 +968,7 @@ your system and how much traffic was routed over those devices: | |||
| 968 | ...] 1375103 17405 0 0 0 0 0 0 | 968 | ...] 1375103 17405 0 0 0 0 0 0 |
| 969 | ...] 1703981 5535 0 0 0 3 0 0 | 969 | ...] 1703981 5535 0 0 0 3 0 0 |
| 970 | 970 | ||
| 971 | In addition, each Channel Bond interface has it's own directory. For | 971 | In addition, each Channel Bond interface has its own directory. For |
| 972 | example, the bond0 device will have a directory called /proc/net/bond0/. | 972 | example, the bond0 device will have a directory called /proc/net/bond0/. |
| 973 | It will contain information that is specific to that bond, such as the | 973 | It will contain information that is specific to that bond, such as the |
| 974 | current slaves of the bond, the link status of the slaves, and how | 974 | current slaves of the bond, the link status of the slaves, and how |
| @@ -1365,7 +1365,7 @@ been accounted as having caused 1MB of write. | |||
| 1365 | In other words: The number of bytes which this process caused to not happen, | 1365 | In other words: The number of bytes which this process caused to not happen, |
| 1366 | by truncating pagecache. A task can cause "negative" IO too. If this task | 1366 | by truncating pagecache. A task can cause "negative" IO too. If this task |
| 1367 | truncates some dirty pagecache, some IO which another task has been accounted | 1367 | truncates some dirty pagecache, some IO which another task has been accounted |
| 1368 | for (in it's write_bytes) will not be happening. We _could_ just subtract that | 1368 | for (in its write_bytes) will not be happening. We _could_ just subtract that |
| 1369 | from the truncating task's write_bytes, but there is information loss in doing | 1369 | from the truncating task's write_bytes, but there is information loss in doing |
| 1370 | that. | 1370 | that. |
| 1371 | 1371 | ||
diff --git a/Documentation/filesystems/smbfs.txt b/Documentation/filesystems/smbfs.txt index f673ef0de0f7..194fb0decd2c 100644 --- a/Documentation/filesystems/smbfs.txt +++ b/Documentation/filesystems/smbfs.txt | |||
| @@ -3,6 +3,6 @@ protocol used by Windows for Workgroups, Windows 95 and Windows NT. | |||
| 3 | Smbfs was inspired by Samba, the program written by Andrew Tridgell | 3 | Smbfs was inspired by Samba, the program written by Andrew Tridgell |
| 4 | that turns any Unix host into a file server for DOS or Windows clients. | 4 | that turns any Unix host into a file server for DOS or Windows clients. |
| 5 | 5 | ||
| 6 | Smbfs is a SMB client, but uses parts of samba for it's operation. For | 6 | Smbfs is a SMB client, but uses parts of samba for its operation. For |
| 7 | more info on samba, including documentation, please go to | 7 | more info on samba, including documentation, please go to |
| 8 | http://www.samba.org/ and then on to your nearest mirror. | 8 | http://www.samba.org/ and then on to your nearest mirror. |
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 3de2f32edd90..b66858538df5 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt | |||
| @@ -72,7 +72,7 @@ structure (this is the kernel-side implementation of file | |||
| 72 | descriptors). The freshly allocated file structure is initialized with | 72 | descriptors). The freshly allocated file structure is initialized with |
| 73 | a pointer to the dentry and a set of file operation member functions. | 73 | a pointer to the dentry and a set of file operation member functions. |
| 74 | These are taken from the inode data. The open() file method is then | 74 | These are taken from the inode data. The open() file method is then |
| 75 | called so the specific filesystem implementation can do it's work. You | 75 | called so the specific filesystem implementation can do its work. You |
| 76 | can see that this is another switch performed by the VFS. The file | 76 | can see that this is another switch performed by the VFS. The file |
| 77 | structure is placed into the file descriptor table for the process. | 77 | structure is placed into the file descriptor table for the process. |
| 78 | 78 | ||
diff --git a/Documentation/hwmon/lm85 b/Documentation/hwmon/lm85 index a13680871bc7..a76aefeeb68a 100644 --- a/Documentation/hwmon/lm85 +++ b/Documentation/hwmon/lm85 | |||
| @@ -157,7 +157,7 @@ temperature configuration points: | |||
| 157 | 157 | ||
| 158 | There are three PWM outputs. The LM85 datasheet suggests that the | 158 | There are three PWM outputs. The LM85 datasheet suggests that the |
| 159 | pwm3 output control both fan3 and fan4. Each PWM can be individually | 159 | pwm3 output control both fan3 and fan4. Each PWM can be individually |
| 160 | configured and assigned to a zone for it's control value. Each PWM can be | 160 | configured and assigned to a zone for its control value. Each PWM can be |
| 161 | configured individually according to the following options. | 161 | configured individually according to the following options. |
| 162 | 162 | ||
| 163 | * pwm#_auto_pwm_min - this specifies the PWM value for temp#_auto_temp_off | 163 | * pwm#_auto_pwm_min - this specifies the PWM value for temp#_auto_temp_off |
diff --git a/Documentation/input/joystick.txt b/Documentation/input/joystick.txt index 154d767b2acb..8007b7ca87bf 100644 --- a/Documentation/input/joystick.txt +++ b/Documentation/input/joystick.txt | |||
| @@ -402,7 +402,7 @@ for the port of the SoundFusion is supported by the cs461x.c module. | |||
| 402 | ~~~~~~~~~~~~~~~~~~~~~~~~ | 402 | ~~~~~~~~~~~~~~~~~~~~~~~~ |
| 403 | The Live! has a special PCI gameport, which, although it doesn't provide | 403 | The Live! has a special PCI gameport, which, although it doesn't provide |
| 404 | any "Enhanced" stuff like 4DWave and friends, is quite a bit faster than | 404 | any "Enhanced" stuff like 4DWave and friends, is quite a bit faster than |
| 405 | it's ISA counterparts. It also requires special support, hence the | 405 | its ISA counterparts. It also requires special support, hence the |
| 406 | emu10k1-gp.c module for it instead of the normal ns558.c one. | 406 | emu10k1-gp.c module for it instead of the normal ns558.c one. |
| 407 | 407 | ||
| 408 | 3.15 SoundBlaster 64 and 128 - ES1370 and ES1371, ESS Solo1 and S3 SonicVibes | 408 | 3.15 SoundBlaster 64 and 128 - ES1370 and ES1371, ESS Solo1 and S3 SonicVibes |
diff --git a/Documentation/intel_txt.txt b/Documentation/intel_txt.txt index 87c8990dbbd9..5dc59b04a71f 100644 --- a/Documentation/intel_txt.txt +++ b/Documentation/intel_txt.txt | |||
| @@ -126,7 +126,7 @@ o Tboot then applies an (optional) user-defined launch policy to | |||
| 126 | o Tboot adjusts the e820 table provided by the bootloader to reserve | 126 | o Tboot adjusts the e820 table provided by the bootloader to reserve |
| 127 | its own location in memory as well as to reserve certain other | 127 | its own location in memory as well as to reserve certain other |
| 128 | TXT-related regions. | 128 | TXT-related regions. |
| 129 | o As part of it's launch, tboot DMA protects all of RAM (using the | 129 | o As part of its launch, tboot DMA protects all of RAM (using the |
| 130 | VT-d PMRs). Thus, the kernel must be booted with 'intel_iommu=on' | 130 | VT-d PMRs). Thus, the kernel must be booted with 'intel_iommu=on' |
| 131 | in order to remove this blanket protection and use VT-d's | 131 | in order to remove this blanket protection and use VT-d's |
| 132 | page-level protection. | 132 | page-level protection. |
diff --git a/Documentation/kbuild/kconfig-language.txt b/Documentation/kbuild/kconfig-language.txt index c412c245848f..b472e4e0ba67 100644 --- a/Documentation/kbuild/kconfig-language.txt +++ b/Documentation/kbuild/kconfig-language.txt | |||
| @@ -181,7 +181,7 @@ Expressions are listed in decreasing order of precedence. | |||
| 181 | (7) Returns the result of max(/expr/, /expr/). | 181 | (7) Returns the result of max(/expr/, /expr/). |
| 182 | 182 | ||
| 183 | An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2 | 183 | An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2 |
| 184 | respectively for calculations). A menu entry becomes visible when it's | 184 | respectively for calculations). A menu entry becomes visible when its |
| 185 | expression evaluates to 'm' or 'y'. | 185 | expression evaluates to 'm' or 'y'. |
| 186 | 186 | ||
| 187 | There are two types of symbols: constant and non-constant symbols. | 187 | There are two types of symbols: constant and non-constant symbols. |
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt index 49efae703979..b2cb16ebcb16 100644 --- a/Documentation/kbuild/kconfig.txt +++ b/Documentation/kbuild/kconfig.txt | |||
| @@ -96,7 +96,7 @@ Environment variables for 'silentoldconfig' | |||
| 96 | KCONFIG_NOSILENTUPDATE | 96 | KCONFIG_NOSILENTUPDATE |
| 97 | -------------------------------------------------- | 97 | -------------------------------------------------- |
| 98 | If this variable has a non-blank value, it prevents silent kernel | 98 | If this variable has a non-blank value, it prevents silent kernel |
| 99 | config udpates (requires explicit updates). | 99 | config updates (requires explicit updates). |
| 100 | 100 | ||
| 101 | KCONFIG_AUTOCONFIG | 101 | KCONFIG_AUTOCONFIG |
| 102 | -------------------------------------------------- | 102 | -------------------------------------------------- |
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt index 28cdc2af2131..ec8d31ee12e0 100644 --- a/Documentation/kernel-docs.txt +++ b/Documentation/kernel-docs.txt | |||
| @@ -116,7 +116,7 @@ | |||
| 116 | Author: Ingo Molnar, Gadi Oxman and Miguel de Icaza. | 116 | Author: Ingo Molnar, Gadi Oxman and Miguel de Icaza. |
| 117 | URL: http://www.linuxjournal.com/article.php?sid=2391 | 117 | URL: http://www.linuxjournal.com/article.php?sid=2391 |
| 118 | Keywords: RAID, MD driver. | 118 | Keywords: RAID, MD driver. |
| 119 | Description: Linux Journal Kernel Korner article. Here is it's | 119 | Description: Linux Journal Kernel Korner article. Here is its |
| 120 | abstract: "A description of the implementation of the RAID-1, | 120 | abstract: "A description of the implementation of the RAID-1, |
| 121 | RAID-4 and RAID-5 personalities of the MD device driver in the | 121 | RAID-4 and RAID-5 personalities of the MD device driver in the |
| 122 | Linux kernel, providing users with high performance and reliable, | 122 | Linux kernel, providing users with high performance and reliable, |
| @@ -127,7 +127,7 @@ | |||
| 127 | URL: http://www.linuxjournal.com/article.php?sid=1219 | 127 | URL: http://www.linuxjournal.com/article.php?sid=1219 |
| 128 | Keywords: device driver, module, loading/unloading modules, | 128 | Keywords: device driver, module, loading/unloading modules, |
| 129 | allocating resources. | 129 | allocating resources. |
| 130 | Description: Linux Journal Kernel Korner article. Here is it's | 130 | Description: Linux Journal Kernel Korner article. Here is its |
| 131 | abstract: "This is the first of a series of four articles | 131 | abstract: "This is the first of a series of four articles |
| 132 | co-authored by Alessandro Rubini and Georg Zezchwitz which present | 132 | co-authored by Alessandro Rubini and Georg Zezchwitz which present |
| 133 | a practical approach to writing Linux device drivers as kernel | 133 | a practical approach to writing Linux device drivers as kernel |
| @@ -141,7 +141,7 @@ | |||
| 141 | Keywords: character driver, init_module, clean_up module, | 141 | Keywords: character driver, init_module, clean_up module, |
| 142 | autodetection, mayor number, minor number, file operations, | 142 | autodetection, mayor number, minor number, file operations, |
| 143 | open(), close(). | 143 | open(), close(). |
| 144 | Description: Linux Journal Kernel Korner article. Here is it's | 144 | Description: Linux Journal Kernel Korner article. Here is its |
| 145 | abstract: "This article, the second of four, introduces part of | 145 | abstract: "This article, the second of four, introduces part of |
| 146 | the actual code to create custom module implementing a character | 146 | the actual code to create custom module implementing a character |
| 147 | device driver. It describes the code for module initialization and | 147 | device driver. It describes the code for module initialization and |
| @@ -152,7 +152,7 @@ | |||
| 152 | URL: http://www.linuxjournal.com/article.php?sid=1221 | 152 | URL: http://www.linuxjournal.com/article.php?sid=1221 |
| 153 | Keywords: read(), write(), select(), ioctl(), blocking/non | 153 | Keywords: read(), write(), select(), ioctl(), blocking/non |
| 154 | blocking mode, interrupt handler. | 154 | blocking mode, interrupt handler. |
| 155 | Description: Linux Journal Kernel Korner article. Here is it's | 155 | Description: Linux Journal Kernel Korner article. Here is its |
| 156 | abstract: "This article, the third of four on writing character | 156 | abstract: "This article, the third of four on writing character |
| 157 | device drivers, introduces concepts of reading, writing, and using | 157 | device drivers, introduces concepts of reading, writing, and using |
| 158 | ioctl-calls". | 158 | ioctl-calls". |
| @@ -161,7 +161,7 @@ | |||
| 161 | Author: Alessandro Rubini and Georg v. Zezschwitz. | 161 | Author: Alessandro Rubini and Georg v. Zezschwitz. |
| 162 | URL: http://www.linuxjournal.com/article.php?sid=1222 | 162 | URL: http://www.linuxjournal.com/article.php?sid=1222 |
| 163 | Keywords: interrupts, irqs, DMA, bottom halves, task queues. | 163 | Keywords: interrupts, irqs, DMA, bottom halves, task queues. |
| 164 | Description: Linux Journal Kernel Korner article. Here is it's | 164 | Description: Linux Journal Kernel Korner article. Here is its |
| 165 | abstract: "This is the fourth in a series of articles about | 165 | abstract: "This is the fourth in a series of articles about |
| 166 | writing character device drivers as loadable kernel modules. This | 166 | writing character device drivers as loadable kernel modules. This |
| 167 | month, we further investigate the field of interrupt handling. | 167 | month, we further investigate the field of interrupt handling. |
diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt index 61c291cddf18..6653017680dd 100644 --- a/Documentation/kprobes.txt +++ b/Documentation/kprobes.txt | |||
| @@ -326,7 +326,7 @@ occurs during execution of kp->pre_handler or kp->post_handler, | |||
| 326 | or during single-stepping of the probed instruction, Kprobes calls | 326 | or during single-stepping of the probed instruction, Kprobes calls |
| 327 | kp->fault_handler. Any or all handlers can be NULL. If kp->flags | 327 | kp->fault_handler. Any or all handlers can be NULL. If kp->flags |
| 328 | is set KPROBE_FLAG_DISABLED, that kp will be registered but disabled, | 328 | is set KPROBE_FLAG_DISABLED, that kp will be registered but disabled, |
| 329 | so, it's handlers aren't hit until calling enable_kprobe(kp). | 329 | so, its handlers aren't hit until calling enable_kprobe(kp). |
| 330 | 330 | ||
| 331 | NOTE: | 331 | NOTE: |
| 332 | 1. With the introduction of the "symbol_name" field to struct kprobe, | 332 | 1. With the introduction of the "symbol_name" field to struct kprobe, |
diff --git a/Documentation/laptops/laptop-mode.txt b/Documentation/laptops/laptop-mode.txt index 2c3c35093023..0bf25eebce94 100644 --- a/Documentation/laptops/laptop-mode.txt +++ b/Documentation/laptops/laptop-mode.txt | |||
| @@ -207,7 +207,7 @@ Tips & Tricks | |||
| 207 | * Drew Scott Daniels observed: "I don't know why, but when I decrease the number | 207 | * Drew Scott Daniels observed: "I don't know why, but when I decrease the number |
| 208 | of colours that my display uses it consumes less battery power. I've seen | 208 | of colours that my display uses it consumes less battery power. I've seen |
| 209 | this on powerbooks too. I hope that this is a piece of information that | 209 | this on powerbooks too. I hope that this is a piece of information that |
| 210 | might be useful to the Laptop Mode patch or it's users." | 210 | might be useful to the Laptop Mode patch or its users." |
| 211 | 211 | ||
| 212 | * In syslog.conf, you can prefix entries with a dash ``-'' to omit syncing the | 212 | * In syslog.conf, you can prefix entries with a dash ``-'' to omit syncing the |
| 213 | file after every logging. When you're using laptop-mode and your disk doesn't | 213 | file after every logging. When you're using laptop-mode and your disk doesn't |
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c index 3119f5db75bd..e9ce3c554514 100644 --- a/Documentation/lguest/lguest.c +++ b/Documentation/lguest/lguest.c | |||
| @@ -263,7 +263,7 @@ static u8 *get_feature_bits(struct device *dev) | |||
| 263 | * Launcher virtual with an offset. | 263 | * Launcher virtual with an offset. |
| 264 | * | 264 | * |
| 265 | * This can be tough to get your head around, but usually it just means that we | 265 | * This can be tough to get your head around, but usually it just means that we |
| 266 | * use these trivial conversion functions when the Guest gives us it's | 266 | * use these trivial conversion functions when the Guest gives us its |
| 267 | * "physical" addresses: | 267 | * "physical" addresses: |
| 268 | */ | 268 | */ |
| 269 | static void *from_guest_phys(unsigned long addr) | 269 | static void *from_guest_phys(unsigned long addr) |
diff --git a/Documentation/md.txt b/Documentation/md.txt index 188f4768f1d5..e4e893ef3e01 100644 --- a/Documentation/md.txt +++ b/Documentation/md.txt | |||
| @@ -136,7 +136,7 @@ raid_disks != 0. | |||
| 136 | 136 | ||
| 137 | Then uninitialized devices can be added with ADD_NEW_DISK. The | 137 | Then uninitialized devices can be added with ADD_NEW_DISK. The |
| 138 | structure passed to ADD_NEW_DISK must specify the state of the device | 138 | structure passed to ADD_NEW_DISK must specify the state of the device |
| 139 | and it's role in the array. | 139 | and its role in the array. |
| 140 | 140 | ||
| 141 | Once started with RUN_ARRAY, uninitialized spares can be added with | 141 | Once started with RUN_ARRAY, uninitialized spares can be added with |
| 142 | HOT_ADD_DISK. | 142 | HOT_ADD_DISK. |
diff --git a/Documentation/netlabel/lsm_interface.txt b/Documentation/netlabel/lsm_interface.txt index 98dd9f7430f2..638c74f7de7f 100644 --- a/Documentation/netlabel/lsm_interface.txt +++ b/Documentation/netlabel/lsm_interface.txt | |||
| @@ -38,7 +38,7 @@ Depending on the exact configuration, translation between the network packet | |||
| 38 | label and the internal LSM security identifier can be time consuming. The | 38 | label and the internal LSM security identifier can be time consuming. The |
| 39 | NetLabel label mapping cache is a caching mechanism which can be used to | 39 | NetLabel label mapping cache is a caching mechanism which can be used to |
| 40 | sidestep much of this overhead once a mapping has been established. Once the | 40 | sidestep much of this overhead once a mapping has been established. Once the |
| 41 | LSM has received a packet, used NetLabel to decode it's security attributes, | 41 | LSM has received a packet, used NetLabel to decode its security attributes, |
| 42 | and translated the security attributes into a LSM internal identifier the LSM | 42 | and translated the security attributes into a LSM internal identifier the LSM |
| 43 | can use the NetLabel caching functions to associate the LSM internal | 43 | can use the NetLabel caching functions to associate the LSM internal |
| 44 | identifier with the network packet's label. This means that in the future | 44 | identifier with the network packet's label. This means that in the future |
diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c index 1b96ccda3836..2bac9618c345 100644 --- a/Documentation/networking/ifenslave.c +++ b/Documentation/networking/ifenslave.c | |||
| @@ -756,7 +756,7 @@ static int enslave(char *master_ifname, char *slave_ifname) | |||
| 756 | */ | 756 | */ |
| 757 | if (abi_ver < 1) { | 757 | if (abi_ver < 1) { |
| 758 | /* For old ABI, the master needs to be | 758 | /* For old ABI, the master needs to be |
| 759 | * down before setting it's hwaddr | 759 | * down before setting its hwaddr |
| 760 | */ | 760 | */ |
| 761 | res = set_if_down(master_ifname, master_flags.ifr_flags); | 761 | res = set_if_down(master_ifname, master_flags.ifr_flags); |
| 762 | if (res) { | 762 | if (res) { |
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt index 09ab0d290326..98f71a5cef00 100644 --- a/Documentation/networking/packet_mmap.txt +++ b/Documentation/networking/packet_mmap.txt | |||
| @@ -100,7 +100,7 @@ by the kernel. | |||
| 100 | The destruction of the socket and all associated resources | 100 | The destruction of the socket and all associated resources |
| 101 | is done by a simple call to close(fd). | 101 | is done by a simple call to close(fd). |
| 102 | 102 | ||
| 103 | Next I will describe PACKET_MMAP settings and it's constraints, | 103 | Next I will describe PACKET_MMAP settings and its constraints, |
| 104 | also the mapping of the circular buffer in the user process and | 104 | also the mapping of the circular buffer in the user process and |
| 105 | the use of this buffer. | 105 | the use of this buffer. |
| 106 | 106 | ||
| @@ -432,7 +432,7 @@ TP_STATUS_LOSING : indicates there were packet drops from last time | |||
| 432 | the PACKET_STATISTICS option. | 432 | the PACKET_STATISTICS option. |
| 433 | 433 | ||
| 434 | TP_STATUS_CSUMNOTREADY: currently it's used for outgoing IP packets which | 434 | TP_STATUS_CSUMNOTREADY: currently it's used for outgoing IP packets which |
| 435 | it's checksum will be done in hardware. So while | 435 | its checksum will be done in hardware. So while |
| 436 | reading the packet we should not try to check the | 436 | reading the packet we should not try to check the |
| 437 | checksum. | 437 | checksum. |
| 438 | 438 | ||
diff --git a/Documentation/power/regulator/consumer.txt b/Documentation/power/regulator/consumer.txt index cdebb5145c25..55c4175d8099 100644 --- a/Documentation/power/regulator/consumer.txt +++ b/Documentation/power/regulator/consumer.txt | |||
| @@ -8,11 +8,11 @@ Please see overview.txt for a description of the terms used in this text. | |||
| 8 | 1. Consumer Regulator Access (static & dynamic drivers) | 8 | 1. Consumer Regulator Access (static & dynamic drivers) |
| 9 | ======================================================= | 9 | ======================================================= |
| 10 | 10 | ||
| 11 | A consumer driver can get access to it's supply regulator by calling :- | 11 | A consumer driver can get access to its supply regulator by calling :- |
| 12 | 12 | ||
| 13 | regulator = regulator_get(dev, "Vcc"); | 13 | regulator = regulator_get(dev, "Vcc"); |
| 14 | 14 | ||
| 15 | The consumer passes in it's struct device pointer and power supply ID. The core | 15 | The consumer passes in its struct device pointer and power supply ID. The core |
| 16 | then finds the correct regulator by consulting a machine specific lookup table. | 16 | then finds the correct regulator by consulting a machine specific lookup table. |
| 17 | If the lookup is successful then this call will return a pointer to the struct | 17 | If the lookup is successful then this call will return a pointer to the struct |
| 18 | regulator that supplies this consumer. | 18 | regulator that supplies this consumer. |
| @@ -34,7 +34,7 @@ usually be called in your device drivers probe() and remove() respectively. | |||
| 34 | 2. Regulator Output Enable & Disable (static & dynamic drivers) | 34 | 2. Regulator Output Enable & Disable (static & dynamic drivers) |
| 35 | ==================================================================== | 35 | ==================================================================== |
| 36 | 36 | ||
| 37 | A consumer can enable it's power supply by calling:- | 37 | A consumer can enable its power supply by calling:- |
| 38 | 38 | ||
| 39 | int regulator_enable(regulator); | 39 | int regulator_enable(regulator); |
| 40 | 40 | ||
| @@ -49,7 +49,7 @@ int regulator_is_enabled(regulator); | |||
| 49 | This will return > zero when the regulator is enabled. | 49 | This will return > zero when the regulator is enabled. |
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | A consumer can disable it's supply when no longer needed by calling :- | 52 | A consumer can disable its supply when no longer needed by calling :- |
| 53 | 53 | ||
| 54 | int regulator_disable(regulator); | 54 | int regulator_disable(regulator); |
| 55 | 55 | ||
| @@ -140,7 +140,7 @@ by calling :- | |||
| 140 | int regulator_set_optimum_mode(struct regulator *regulator, int load_uA); | 140 | int regulator_set_optimum_mode(struct regulator *regulator, int load_uA); |
| 141 | 141 | ||
| 142 | This will cause the core to recalculate the total load on the regulator (based | 142 | This will cause the core to recalculate the total load on the regulator (based |
| 143 | on all it's consumers) and change operating mode (if necessary and permitted) | 143 | on all its consumers) and change operating mode (if necessary and permitted) |
| 144 | to best match the current operating load. | 144 | to best match the current operating load. |
| 145 | 145 | ||
| 146 | The load_uA value can be determined from the consumers datasheet. e.g.most | 146 | The load_uA value can be determined from the consumers datasheet. e.g.most |
diff --git a/Documentation/power/regulator/machine.txt b/Documentation/power/regulator/machine.txt index 63728fed620b..bdec39b9bd75 100644 --- a/Documentation/power/regulator/machine.txt +++ b/Documentation/power/regulator/machine.txt | |||
| @@ -52,7 +52,7 @@ static struct regulator_init_data regulator1_data = { | |||
| 52 | }; | 52 | }; |
| 53 | 53 | ||
| 54 | Regulator-1 supplies power to Regulator-2. This relationship must be registered | 54 | Regulator-1 supplies power to Regulator-2. This relationship must be registered |
| 55 | with the core so that Regulator-1 is also enabled when Consumer A enables it's | 55 | with the core so that Regulator-1 is also enabled when Consumer A enables its |
| 56 | supply (Regulator-2). The supply regulator is set by the supply_regulator_dev | 56 | supply (Regulator-2). The supply regulator is set by the supply_regulator_dev |
| 57 | field below:- | 57 | field below:- |
| 58 | 58 | ||
diff --git a/Documentation/power/regulator/overview.txt b/Documentation/power/regulator/overview.txt index ffd185bb6054..9363e056188a 100644 --- a/Documentation/power/regulator/overview.txt +++ b/Documentation/power/regulator/overview.txt | |||
| @@ -35,16 +35,16 @@ Some terms used in this document:- | |||
| 35 | o Consumer - Electronic device that is supplied power by a regulator. | 35 | o Consumer - Electronic device that is supplied power by a regulator. |
| 36 | Consumers can be classified into two types:- | 36 | Consumers can be classified into two types:- |
| 37 | 37 | ||
| 38 | Static: consumer does not change it's supply voltage or | 38 | Static: consumer does not change its supply voltage or |
| 39 | current limit. It only needs to enable or disable it's | 39 | current limit. It only needs to enable or disable it's |
| 40 | power supply. It's supply voltage is set by the hardware, | 40 | power supply. Its supply voltage is set by the hardware, |
| 41 | bootloader, firmware or kernel board initialisation code. | 41 | bootloader, firmware or kernel board initialisation code. |
| 42 | 42 | ||
| 43 | Dynamic: consumer needs to change it's supply voltage or | 43 | Dynamic: consumer needs to change it's supply voltage or |
| 44 | current limit to meet operation demands. | 44 | current limit to meet operation demands. |
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | o Power Domain - Electronic circuit that is supplied it's input power by the | 47 | o Power Domain - Electronic circuit that is supplied its input power by the |
| 48 | output power of a regulator, switch or by another power | 48 | output power of a regulator, switch or by another power |
| 49 | domain. | 49 | domain. |
| 50 | 50 | ||
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt index 79f533f38c61..46d22105aa07 100644 --- a/Documentation/powerpc/booting-without-of.txt +++ b/Documentation/powerpc/booting-without-of.txt | |||
| @@ -1289,7 +1289,7 @@ link between a device node and its interrupt parent in | |||
| 1289 | the interrupt tree. The value of interrupt-parent is the | 1289 | the interrupt tree. The value of interrupt-parent is the |
| 1290 | phandle of the parent node. | 1290 | phandle of the parent node. |
| 1291 | 1291 | ||
| 1292 | If the interrupt-parent property is not defined for a node, it's | 1292 | If the interrupt-parent property is not defined for a node, its |
| 1293 | interrupt parent is assumed to be an ancestor in the node's | 1293 | interrupt parent is assumed to be an ancestor in the node's |
| 1294 | _device tree_ hierarchy. | 1294 | _device tree_ hierarchy. |
| 1295 | 1295 | ||
diff --git a/Documentation/powerpc/dts-bindings/xilinx.txt b/Documentation/powerpc/dts-bindings/xilinx.txt index ea68046bb9cb..299d0923537b 100644 --- a/Documentation/powerpc/dts-bindings/xilinx.txt +++ b/Documentation/powerpc/dts-bindings/xilinx.txt | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | control how the core is synthesized. Historically, the EDK tool would | 11 | control how the core is synthesized. Historically, the EDK tool would |
| 12 | extract the device parameters relevant to device drivers and copy them | 12 | extract the device parameters relevant to device drivers and copy them |
| 13 | into an 'xparameters.h' in the form of #define symbols. This tells the | 13 | into an 'xparameters.h' in the form of #define symbols. This tells the |
| 14 | device drivers how the IP cores are configured, but it requres the kernel | 14 | device drivers how the IP cores are configured, but it requires the kernel |
| 15 | to be recompiled every time the FPGA bitstream is resynthesized. | 15 | to be recompiled every time the FPGA bitstream is resynthesized. |
| 16 | 16 | ||
| 17 | The new approach is to export the parameters into the device tree and | 17 | The new approach is to export the parameters into the device tree and |
diff --git a/Documentation/powerpc/phyp-assisted-dump.txt b/Documentation/powerpc/phyp-assisted-dump.txt index c4682b982a2e..ad340205d96a 100644 --- a/Documentation/powerpc/phyp-assisted-dump.txt +++ b/Documentation/powerpc/phyp-assisted-dump.txt | |||
| @@ -19,7 +19,7 @@ dump offers several strong, practical advantages: | |||
| 19 | immediately available to the system for normal use. | 19 | immediately available to the system for normal use. |
| 20 | -- After the dump is completed, no further reboots are | 20 | -- After the dump is completed, no further reboots are |
| 21 | required; the system will be fully usable, and running | 21 | required; the system will be fully usable, and running |
| 22 | in it's normal, production mode on it normal kernel. | 22 | in its normal, production mode on its normal kernel. |
| 23 | 23 | ||
| 24 | The above can only be accomplished by coordination with, | 24 | The above can only be accomplished by coordination with, |
| 25 | and assistance from the hypervisor. The procedure is | 25 | and assistance from the hypervisor. The procedure is |
diff --git a/Documentation/rt-mutex-design.txt b/Documentation/rt-mutex-design.txt index 4b736d24da7a..8df0b782c4d7 100644 --- a/Documentation/rt-mutex-design.txt +++ b/Documentation/rt-mutex-design.txt | |||
| @@ -657,7 +657,7 @@ here. | |||
| 657 | 657 | ||
| 658 | The waiter structure has a "task" field that points to the task that is blocked | 658 | The waiter structure has a "task" field that points to the task that is blocked |
| 659 | on the mutex. This field can be NULL the first time it goes through the loop | 659 | on the mutex. This field can be NULL the first time it goes through the loop |
| 660 | or if the task is a pending owner and had it's mutex stolen. If the "task" | 660 | or if the task is a pending owner and had its mutex stolen. If the "task" |
| 661 | field is NULL then we need to set up the accounting for it. | 661 | field is NULL then we need to set up the accounting for it. |
| 662 | 662 | ||
| 663 | Task blocks on mutex | 663 | Task blocks on mutex |
diff --git a/Documentation/scsi/ChangeLog.lpfc b/Documentation/scsi/ChangeLog.lpfc index 2ffc1148eb95..e759e92e286d 100644 --- a/Documentation/scsi/ChangeLog.lpfc +++ b/Documentation/scsi/ChangeLog.lpfc | |||
| @@ -707,7 +707,7 @@ Changes from 20040920 to 20041018 | |||
| 707 | * Integrate patches from Christoph Hellwig: two new helpers common | 707 | * Integrate patches from Christoph Hellwig: two new helpers common |
| 708 | to lpfc_sli_resume_iocb and lpfc_sli_issue_iocb - singificant | 708 | to lpfc_sli_resume_iocb and lpfc_sli_issue_iocb - singificant |
| 709 | cleanup of those two functions - the unused SLI_IOCB_USE_TXQ is | 709 | cleanup of those two functions - the unused SLI_IOCB_USE_TXQ is |
| 710 | gone - lpfc_sli_issue_iocb_wait loses it's flags argument | 710 | gone - lpfc_sli_issue_iocb_wait loses its flags argument |
| 711 | totally. | 711 | totally. |
| 712 | * Fix in lpfc_sli.c: we can not store a 5 bit value in a 4-bit | 712 | * Fix in lpfc_sli.c: we can not store a 5 bit value in a 4-bit |
| 713 | field. | 713 | field. |
| @@ -1028,7 +1028,7 @@ Changes from 20040614 to 20040709 | |||
| 1028 | * Remove the need for buf_tmo. | 1028 | * Remove the need for buf_tmo. |
| 1029 | * Changed ULP_BDE64 to struct ulp_bde64. | 1029 | * Changed ULP_BDE64 to struct ulp_bde64. |
| 1030 | * Changed ULP_BDE to struct ulp_bde. | 1030 | * Changed ULP_BDE to struct ulp_bde. |
| 1031 | * Cleanup lpfc_os_return_scsi_cmd() and it's call path. | 1031 | * Cleanup lpfc_os_return_scsi_cmd() and its call path. |
| 1032 | * Removed lpfc_no_device_delay. | 1032 | * Removed lpfc_no_device_delay. |
| 1033 | * Consolidating lpfc_hba_put_event() into lpfc_put_event(). | 1033 | * Consolidating lpfc_hba_put_event() into lpfc_put_event(). |
| 1034 | * Removed following attributes and their functionality: | 1034 | * Removed following attributes and their functionality: |
diff --git a/Documentation/scsi/FlashPoint.txt b/Documentation/scsi/FlashPoint.txt index d5acaa300a46..1540a92f6d2b 100644 --- a/Documentation/scsi/FlashPoint.txt +++ b/Documentation/scsi/FlashPoint.txt | |||
| @@ -71,7 +71,7 @@ peters@mylex.com | |||
| 71 | 71 | ||
| 72 | Ever since its introduction last October, the BusLogic FlashPoint LT has | 72 | Ever since its introduction last October, the BusLogic FlashPoint LT has |
| 73 | been problematic for members of the Linux community, in that no Linux | 73 | been problematic for members of the Linux community, in that no Linux |
| 74 | drivers have been available for this new Ultra SCSI product. Despite it's | 74 | drivers have been available for this new Ultra SCSI product. Despite its |
| 75 | officially being positioned as a desktop workstation product, and not being | 75 | officially being positioned as a desktop workstation product, and not being |
| 76 | particularly well suited for a high performance multitasking operating | 76 | particularly well suited for a high performance multitasking operating |
| 77 | system like Linux, the FlashPoint LT has been touted by computer system | 77 | system like Linux, the FlashPoint LT has been touted by computer system |
diff --git a/Documentation/scsi/dtc3x80.txt b/Documentation/scsi/dtc3x80.txt index e8ae6230ab3e..1d7af9f9a8ed 100644 --- a/Documentation/scsi/dtc3x80.txt +++ b/Documentation/scsi/dtc3x80.txt | |||
| @@ -12,7 +12,7 @@ The 3180 does not. Otherwise, they are identical. | |||
| 12 | The DTC3x80 does not support DMA but it does have Pseudo-DMA which is | 12 | The DTC3x80 does not support DMA but it does have Pseudo-DMA which is |
| 13 | supported by the driver. | 13 | supported by the driver. |
| 14 | 14 | ||
| 15 | It's DTC406 scsi chip is supposedly compatible with the NCR 53C400. | 15 | Its DTC406 scsi chip is supposedly compatible with the NCR 53C400. |
| 16 | It is memory mapped, uses an IRQ, but no dma or io-port. There is | 16 | It is memory mapped, uses an IRQ, but no dma or io-port. There is |
| 17 | internal DMA, between SCSI bus and an on-chip 128-byte buffer. Double | 17 | internal DMA, between SCSI bus and an on-chip 128-byte buffer. Double |
| 18 | buffering is done automagically by the chip. Data is transferred | 18 | buffering is done automagically by the chip. Data is transferred |
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt index 08e2b4d04aab..cda5f8fa2c66 100644 --- a/Documentation/scsi/ncr53c8xx.txt +++ b/Documentation/scsi/ncr53c8xx.txt | |||
| @@ -1479,7 +1479,7 @@ Wide16 SCSI. | |||
| 1479 | Enabling serial NVRAM support enables detection of the serial NVRAM included | 1479 | Enabling serial NVRAM support enables detection of the serial NVRAM included |
| 1480 | on Symbios and some Symbios compatible host adaptors, and Tekram boards. The | 1480 | on Symbios and some Symbios compatible host adaptors, and Tekram boards. The |
| 1481 | serial NVRAM is used by Symbios and Tekram to hold set up parameters for the | 1481 | serial NVRAM is used by Symbios and Tekram to hold set up parameters for the |
| 1482 | host adaptor and it's attached drives. | 1482 | host adaptor and its attached drives. |
| 1483 | 1483 | ||
| 1484 | The Symbios NVRAM also holds data on the boot order of host adaptors in a | 1484 | The Symbios NVRAM also holds data on the boot order of host adaptors in a |
| 1485 | system with more than one host adaptor. This enables the order of scanning | 1485 | system with more than one host adaptor. This enables the order of scanning |
diff --git a/Documentation/scsi/osst.txt b/Documentation/scsi/osst.txt index f536907e241d..2b21890bc983 100644 --- a/Documentation/scsi/osst.txt +++ b/Documentation/scsi/osst.txt | |||
| @@ -40,7 +40,7 @@ behavior looks very much the same as st to the userspace applications. | |||
| 40 | 40 | ||
| 41 | History | 41 | History |
| 42 | ------- | 42 | ------- |
| 43 | In the first place, osst shared it's identity very much with st. That meant | 43 | In the first place, osst shared its identity very much with st. That meant |
| 44 | that it used the same kernel structures and the same device node as st. | 44 | that it used the same kernel structures and the same device node as st. |
| 45 | So you could only have either of them being present in the kernel. This has | 45 | So you could only have either of them being present in the kernel. This has |
| 46 | been fixed by registering an own device, now. | 46 | been fixed by registering an own device, now. |
diff --git a/Documentation/scsi/scsi_fc_transport.txt b/Documentation/scsi/scsi_fc_transport.txt index aec6549ab097..e00192de4d1c 100644 --- a/Documentation/scsi/scsi_fc_transport.txt +++ b/Documentation/scsi/scsi_fc_transport.txt | |||
| @@ -70,7 +70,7 @@ Overview: | |||
| 70 | up to an administrative entity controlling the vport. For example, | 70 | up to an administrative entity controlling the vport. For example, |
| 71 | if vports are to be associated with virtual machines, a XEN mgmt | 71 | if vports are to be associated with virtual machines, a XEN mgmt |
| 72 | utility would be responsible for creating wwpn/wwnn's for the vport, | 72 | utility would be responsible for creating wwpn/wwnn's for the vport, |
| 73 | using it's own naming authority and OUI. (Note: it already does this | 73 | using its own naming authority and OUI. (Note: it already does this |
| 74 | for virtual MAC addresses). | 74 | for virtual MAC addresses). |
| 75 | 75 | ||
| 76 | 76 | ||
| @@ -81,7 +81,7 @@ Device Trees and Vport Objects: | |||
| 81 | with rports and scsi target objects underneath it. Currently the FC | 81 | with rports and scsi target objects underneath it. Currently the FC |
| 82 | transport creates the vport object and places it under the scsi_host | 82 | transport creates the vport object and places it under the scsi_host |
| 83 | object corresponding to the physical adapter. The LLDD will allocate | 83 | object corresponding to the physical adapter. The LLDD will allocate |
| 84 | a new scsi_host for the vport and link it's object under the vport. | 84 | a new scsi_host for the vport and link its object under the vport. |
| 85 | The remainder of the tree under the vports scsi_host is the same | 85 | The remainder of the tree under the vports scsi_host is the same |
| 86 | as the non-NPIV case. The transport is written currently to easily | 86 | as the non-NPIV case. The transport is written currently to easily |
| 87 | allow the parent of the vport to be something other than the scsi_host. | 87 | allow the parent of the vport to be something other than the scsi_host. |
diff --git a/Documentation/scsi/sym53c8xx_2.txt b/Documentation/scsi/sym53c8xx_2.txt index eb9a7b905b64..6f63b7989679 100644 --- a/Documentation/scsi/sym53c8xx_2.txt +++ b/Documentation/scsi/sym53c8xx_2.txt | |||
| @@ -687,7 +687,7 @@ maintain the driver code. | |||
| 687 | Enabling serial NVRAM support enables detection of the serial NVRAM included | 687 | Enabling serial NVRAM support enables detection of the serial NVRAM included |
| 688 | on Symbios and some Symbios compatible host adaptors, and Tekram boards. The | 688 | on Symbios and some Symbios compatible host adaptors, and Tekram boards. The |
| 689 | serial NVRAM is used by Symbios and Tekram to hold set up parameters for the | 689 | serial NVRAM is used by Symbios and Tekram to hold set up parameters for the |
| 690 | host adaptor and it's attached drives. | 690 | host adaptor and its attached drives. |
| 691 | 691 | ||
| 692 | The Symbios NVRAM also holds data on the boot order of host adaptors in a | 692 | The Symbios NVRAM also holds data on the boot order of host adaptors in a |
| 693 | system with more than one host adaptor. This information is no longer used | 693 | system with more than one host adaptor. This information is no longer used |
diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt index 9ac842be9b4f..05bf5a0eee41 100644 --- a/Documentation/sound/alsa/soc/dapm.txt +++ b/Documentation/sound/alsa/soc/dapm.txt | |||
| @@ -188,8 +188,8 @@ The WM8731 output mixer has 3 inputs (sources) | |||
| 188 | 3. Mic Sidetone Input | 188 | 3. Mic Sidetone Input |
| 189 | 189 | ||
| 190 | Each input in this example has a kcontrol associated with it (defined in example | 190 | Each input in this example has a kcontrol associated with it (defined in example |
| 191 | above) and is connected to the output mixer via it's kcontrol name. We can now | 191 | above) and is connected to the output mixer via its kcontrol name. We can now |
| 192 | connect the destination widget (wrt audio signal) with it's source widgets. | 192 | connect the destination widget (wrt audio signal) with its source widgets. |
| 193 | 193 | ||
| 194 | /* output mixer */ | 194 | /* output mixer */ |
| 195 | {"Output Mixer", "Line Bypass Switch", "Line Input"}, | 195 | {"Output Mixer", "Line Bypass Switch", "Line Input"}, |
diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt index bab7711ce963..2524c75557df 100644 --- a/Documentation/sound/alsa/soc/machine.txt +++ b/Documentation/sound/alsa/soc/machine.txt | |||
| @@ -67,7 +67,7 @@ static struct snd_soc_dai_link corgi_dai = { | |||
| 67 | .ops = &corgi_ops, | 67 | .ops = &corgi_ops, |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | struct snd_soc_card then sets up the machine with it's DAIs. e.g. | 70 | struct snd_soc_card then sets up the machine with its DAIs. e.g. |
| 71 | 71 | ||
| 72 | /* corgi audio machine driver */ | 72 | /* corgi audio machine driver */ |
| 73 | static struct snd_soc_card snd_soc_corgi = { | 73 | static struct snd_soc_card snd_soc_corgi = { |
diff --git a/Documentation/sound/alsa/soc/overview.txt b/Documentation/sound/alsa/soc/overview.txt index 1e4c6d3655f2..138ac88c1461 100644 --- a/Documentation/sound/alsa/soc/overview.txt +++ b/Documentation/sound/alsa/soc/overview.txt | |||
| @@ -33,7 +33,7 @@ features :- | |||
| 33 | and machines. | 33 | and machines. |
| 34 | 34 | ||
| 35 | * Easy I2S/PCM audio interface setup between codec and SoC. Each SoC | 35 | * Easy I2S/PCM audio interface setup between codec and SoC. Each SoC |
| 36 | interface and codec registers it's audio interface capabilities with the | 36 | interface and codec registers its audio interface capabilities with the |
| 37 | core and are subsequently matched and configured when the application | 37 | core and are subsequently matched and configured when the application |
| 38 | hardware parameters are known. | 38 | hardware parameters are known. |
| 39 | 39 | ||
diff --git a/Documentation/sparse.txt b/Documentation/sparse.txt index 34c76a55bc04..9b659c79a547 100644 --- a/Documentation/sparse.txt +++ b/Documentation/sparse.txt | |||
| @@ -54,12 +54,12 @@ Getting sparse | |||
| 54 | ~~~~~~~~~~~~~~ | 54 | ~~~~~~~~~~~~~~ |
| 55 | 55 | ||
| 56 | You can get latest released versions from the Sparse homepage at | 56 | You can get latest released versions from the Sparse homepage at |
| 57 | http://www.kernel.org/pub/linux/kernel/people/josh/sparse/ | 57 | https://sparse.wiki.kernel.org/index.php/Main_Page |
| 58 | 58 | ||
| 59 | Alternatively, you can get snapshots of the latest development version | 59 | Alternatively, you can get snapshots of the latest development version |
| 60 | of sparse using git to clone.. | 60 | of sparse using git to clone.. |
| 61 | 61 | ||
| 62 | git://git.kernel.org/pub/scm/linux/kernel/git/josh/sparse.git | 62 | git://git.kernel.org/pub/scm/devel/sparse/sparse.git |
| 63 | 63 | ||
| 64 | DaveJ has hourly generated tarballs of the git tree available at.. | 64 | DaveJ has hourly generated tarballs of the git tree available at.. |
| 65 | 65 | ||
diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt index 5d8bc2cd250c..c1a1fd636bf9 100644 --- a/Documentation/sysfs-rules.txt +++ b/Documentation/sysfs-rules.txt | |||
| @@ -125,7 +125,7 @@ versions of the sysfs interface. | |||
| 125 | - Block | 125 | - Block |
| 126 | The converted block subsystem at /sys/class/block or | 126 | The converted block subsystem at /sys/class/block or |
| 127 | /sys/subsystem/block will contain the links for disks and partitions | 127 | /sys/subsystem/block will contain the links for disks and partitions |
| 128 | at the same level, never in a hierarchy. Assuming the block subsytem to | 128 | at the same level, never in a hierarchy. Assuming the block subsystem to |
| 129 | contain only disks and not partition devices in the same flat list is | 129 | contain only disks and not partition devices in the same flat list is |
| 130 | a bug in the application. | 130 | a bug in the application. |
| 131 | 131 | ||
diff --git a/Documentation/trace/events.txt b/Documentation/trace/events.txt index 778ddf38b82c..09bd8e902989 100644 --- a/Documentation/trace/events.txt +++ b/Documentation/trace/events.txt | |||
| @@ -239,7 +239,7 @@ subsystem's filter file. | |||
| 239 | 239 | ||
| 240 | For convenience, filters for every event in a subsystem can be set or | 240 | For convenience, filters for every event in a subsystem can be set or |
| 241 | cleared as a group by writing a filter expression into the filter file | 241 | cleared as a group by writing a filter expression into the filter file |
| 242 | at the root of the subsytem. Note however, that if a filter for any | 242 | at the root of the subsystem. Note however, that if a filter for any |
| 243 | event within the subsystem lacks a field specified in the subsystem | 243 | event within the subsystem lacks a field specified in the subsystem |
| 244 | filter, or if the filter can't be applied for any other reason, the | 244 | filter, or if the filter can't be applied for any other reason, the |
| 245 | filter for that event will retain its previous setting. This can | 245 | filter for that event will retain its previous setting. This can |
| @@ -251,7 +251,7 @@ fields can be guaranteed to propagate successfully to all events. | |||
| 251 | Here are a few subsystem filter examples that also illustrate the | 251 | Here are a few subsystem filter examples that also illustrate the |
| 252 | above points: | 252 | above points: |
| 253 | 253 | ||
| 254 | Clear the filters on all events in the sched subsytem: | 254 | Clear the filters on all events in the sched subsystem: |
| 255 | 255 | ||
| 256 | # cd /sys/kernel/debug/tracing/events/sched | 256 | # cd /sys/kernel/debug/tracing/events/sched |
| 257 | # echo 0 > filter | 257 | # echo 0 > filter |
| @@ -261,7 +261,7 @@ none | |||
| 261 | none | 261 | none |
| 262 | 262 | ||
| 263 | Set a filter using only common fields for all events in the sched | 263 | Set a filter using only common fields for all events in the sched |
| 264 | subsytem (all events end up with the same filter): | 264 | subsystem (all events end up with the same filter): |
| 265 | 265 | ||
| 266 | # cd /sys/kernel/debug/tracing/events/sched | 266 | # cd /sys/kernel/debug/tracing/events/sched |
| 267 | # echo common_pid == 0 > filter | 267 | # echo common_pid == 0 > filter |
| @@ -271,7 +271,7 @@ common_pid == 0 | |||
| 271 | common_pid == 0 | 271 | common_pid == 0 |
| 272 | 272 | ||
| 273 | Attempt to set a filter using a non-common field for all events in the | 273 | Attempt to set a filter using a non-common field for all events in the |
| 274 | sched subsytem (all events but those that have a prev_pid field retain | 274 | sched subsystem (all events but those that have a prev_pid field retain |
| 275 | their old filters): | 275 | their old filters): |
| 276 | 276 | ||
| 277 | # cd /sys/kernel/debug/tracing/events/sched | 277 | # cd /sys/kernel/debug/tracing/events/sched |
diff --git a/Documentation/usb/WUSB-Design-overview.txt b/Documentation/usb/WUSB-Design-overview.txt index c480e9c32dbd..4c5e37939344 100644 --- a/Documentation/usb/WUSB-Design-overview.txt +++ b/Documentation/usb/WUSB-Design-overview.txt | |||
| @@ -381,7 +381,7 @@ descriptor that gives us the status of the transfer, its identification | |||
| 381 | we issue another URB to read into the destination buffer the chunk of | 381 | we issue another URB to read into the destination buffer the chunk of |
| 382 | data coming out of the remote endpoint. Done, wait for the next guy. The | 382 | data coming out of the remote endpoint. Done, wait for the next guy. The |
| 383 | callbacks for the URBs issued from here are the ones that will declare | 383 | callbacks for the URBs issued from here are the ones that will declare |
| 384 | the xfer complete at some point and call it's callback. | 384 | the xfer complete at some point and call its callback. |
| 385 | 385 | ||
| 386 | Seems simple, but the implementation is not trivial. | 386 | Seems simple, but the implementation is not trivial. |
| 387 | 387 | ||
diff --git a/Documentation/vm/numa_memory_policy.txt b/Documentation/vm/numa_memory_policy.txt index be45dbb9d7f2..6690fc34ef6d 100644 --- a/Documentation/vm/numa_memory_policy.txt +++ b/Documentation/vm/numa_memory_policy.txt | |||
| @@ -45,7 +45,7 @@ most general to most specific: | |||
| 45 | to establish the task policy for a child task exec()'d from an | 45 | to establish the task policy for a child task exec()'d from an |
| 46 | executable image that has no awareness of memory policy. See the | 46 | executable image that has no awareness of memory policy. See the |
| 47 | MEMORY POLICY APIS section, below, for an overview of the system call | 47 | MEMORY POLICY APIS section, below, for an overview of the system call |
| 48 | that a task may use to set/change it's task/process policy. | 48 | that a task may use to set/change its task/process policy. |
| 49 | 49 | ||
| 50 | In a multi-threaded task, task policies apply only to the thread | 50 | In a multi-threaded task, task policies apply only to the thread |
| 51 | [Linux kernel task] that installs the policy and any threads | 51 | [Linux kernel task] that installs the policy and any threads |
| @@ -301,7 +301,7 @@ decrement this reference count, respectively. mpol_put() will only free | |||
| 301 | the structure back to the mempolicy kmem cache when the reference count | 301 | the structure back to the mempolicy kmem cache when the reference count |
| 302 | goes to zero. | 302 | goes to zero. |
| 303 | 303 | ||
| 304 | When a new memory policy is allocated, it's reference count is initialized | 304 | When a new memory policy is allocated, its reference count is initialized |
| 305 | to '1', representing the reference held by the task that is installing the | 305 | to '1', representing the reference held by the task that is installing the |
| 306 | new policy. When a pointer to a memory policy structure is stored in another | 306 | new policy. When a pointer to a memory policy structure is stored in another |
| 307 | structure, another reference is added, as the task's reference will be dropped | 307 | structure, another reference is added, as the task's reference will be dropped |
diff --git a/Documentation/w1/w1.generic b/Documentation/w1/w1.generic index e3333eec4320..212f4ac31c01 100644 --- a/Documentation/w1/w1.generic +++ b/Documentation/w1/w1.generic | |||
| @@ -25,7 +25,7 @@ When a w1 master driver registers with the w1 subsystem, the following occurs: | |||
| 25 | - sysfs entries for that w1 master are created | 25 | - sysfs entries for that w1 master are created |
| 26 | - the w1 bus is periodically searched for new slave devices | 26 | - the w1 bus is periodically searched for new slave devices |
| 27 | 27 | ||
| 28 | When a device is found on the bus, w1 core checks if driver for it's family is | 28 | When a device is found on the bus, w1 core checks if driver for its family is |
| 29 | loaded. If so, the family driver is attached to the slave. | 29 | loaded. If so, the family driver is attached to the slave. |
| 30 | If there is no driver for the family, default one is assigned, which allows to perform | 30 | If there is no driver for the family, default one is assigned, which allows to perform |
| 31 | almost any kind of operations. Each logical operation is a transaction | 31 | almost any kind of operations. Each logical operation is a transaction |
diff --git a/MAINTAINERS b/MAINTAINERS index de39882924d0..2f5510cc142d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2701,16 +2701,12 @@ F: Documentation/timers/hpet.txt | |||
| 2701 | F: drivers/char/hpet.c | 2701 | F: drivers/char/hpet.c |
| 2702 | F: include/linux/hpet.h | 2702 | F: include/linux/hpet.h |
| 2703 | 2703 | ||
| 2704 | HPET: i386 | 2704 | HPET: x86 |
| 2705 | M: "Venkatesh Pallipadi (Venki)" <venkatesh.pallipadi@intel.com> | 2705 | M: "Venkatesh Pallipadi (Venki)" <venki@google.com> |
| 2706 | S: Maintained | 2706 | S: Maintained |
| 2707 | F: arch/x86/kernel/hpet.c | 2707 | F: arch/x86/kernel/hpet.c |
| 2708 | F: arch/x86/include/asm/hpet.h | 2708 | F: arch/x86/include/asm/hpet.h |
| 2709 | 2709 | ||
| 2710 | HPET: x86_64 | ||
| 2711 | M: Vojtech Pavlik <vojtech@suse.cz> | ||
| 2712 | S: Maintained | ||
| 2713 | |||
| 2714 | HPET: ACPI | 2710 | HPET: ACPI |
| 2715 | M: Bob Picco <bob.picco@hp.com> | 2711 | M: Bob Picco <bob.picco@hp.com> |
| 2716 | S: Maintained | 2712 | S: Maintained |
diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h index b3e888638bb7..6f32f9c84a2d 100644 --- a/arch/alpha/include/asm/thread_info.h +++ b/arch/alpha/include/asm/thread_info.h | |||
| @@ -77,7 +77,7 @@ register struct thread_info *__current_thread_info __asm__("$8"); | |||
| 77 | #define TIF_UAC_NOPRINT 10 /* see sysinfo.h */ | 77 | #define TIF_UAC_NOPRINT 10 /* see sysinfo.h */ |
| 78 | #define TIF_UAC_NOFIX 11 | 78 | #define TIF_UAC_NOFIX 11 |
| 79 | #define TIF_UAC_SIGBUS 12 | 79 | #define TIF_UAC_SIGBUS 12 |
| 80 | #define TIF_MEMDIE 13 | 80 | #define TIF_MEMDIE 13 /* is terminating due to OOM killer */ |
| 81 | #define TIF_RESTORE_SIGMASK 14 /* restore signal mask in do_signal */ | 81 | #define TIF_RESTORE_SIGMASK 14 /* restore signal mask in do_signal */ |
| 82 | #define TIF_FREEZE 16 /* is freezing for suspend */ | 82 | #define TIF_FREEZE 16 /* is freezing for suspend */ |
| 83 | 83 | ||
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index b74970ec02c4..763e29fa8530 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h | |||
| @@ -141,7 +141,7 @@ extern void vfp_flush_hwstate(struct thread_info *); | |||
| 141 | #define TIF_SYSCALL_TRACE 8 | 141 | #define TIF_SYSCALL_TRACE 8 |
| 142 | #define TIF_POLLING_NRFLAG 16 | 142 | #define TIF_POLLING_NRFLAG 16 |
| 143 | #define TIF_USING_IWMMXT 17 | 143 | #define TIF_USING_IWMMXT 17 |
| 144 | #define TIF_MEMDIE 18 | 144 | #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ |
| 145 | #define TIF_FREEZE 19 | 145 | #define TIF_FREEZE 19 |
| 146 | #define TIF_RESTORE_SIGMASK 20 | 146 | #define TIF_RESTORE_SIGMASK 20 |
| 147 | 147 | ||
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 83b1aa63d778..0c3c0c884cd3 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
| @@ -241,7 +241,7 @@ static struct clk clk_hsmmc = { | |||
| 241 | 241 | ||
| 242 | /* i2s_eplldiv | 242 | /* i2s_eplldiv |
| 243 | * | 243 | * |
| 244 | * This clock is the output from the I2S divisor of ESYSCLK, and is seperate | 244 | * This clock is the output from the I2S divisor of ESYSCLK, and is separate |
| 245 | * from the mux that comes after it (cannot merge into one single clock) | 245 | * from the mux that comes after it (cannot merge into one single clock) |
| 246 | */ | 246 | */ |
| 247 | 247 | ||
diff --git a/arch/arm/plat-samsung/include/plat/gpio-core.h b/arch/arm/plat-samsung/include/plat/gpio-core.h index f3a68d1a07b9..e358c7da8480 100644 --- a/arch/arm/plat-samsung/include/plat/gpio-core.h +++ b/arch/arm/plat-samsung/include/plat/gpio-core.h | |||
| @@ -107,7 +107,7 @@ extern void s3c_gpiolib_add(struct s3c_gpio_chip *chip); | |||
| 107 | * others = Special functions (dependant on bank) | 107 | * others = Special functions (dependant on bank) |
| 108 | * | 108 | * |
| 109 | * Note, since the code to deal with the case where there are two control | 109 | * Note, since the code to deal with the case where there are two control |
| 110 | * registers instead of one, we do not have a seperate set of function | 110 | * registers instead of one, we do not have a separate set of function |
| 111 | * (samsung_gpiolib_add_4bit2_chips)for each case. | 111 | * (samsung_gpiolib_add_4bit2_chips)for each case. |
| 112 | */ | 112 | */ |
| 113 | extern void samsung_gpiolib_add_4bit_chips(struct s3c_gpio_chip *chip, | 113 | extern void samsung_gpiolib_add_4bit_chips(struct s3c_gpio_chip *chip, |
diff --git a/arch/avr32/include/asm/thread_info.h b/arch/avr32/include/asm/thread_info.h index fd0c5d7e9337..7a9c03dcb0b6 100644 --- a/arch/avr32/include/asm/thread_info.h +++ b/arch/avr32/include/asm/thread_info.h | |||
| @@ -81,7 +81,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 81 | TIF_NEED_RESCHED */ | 81 | TIF_NEED_RESCHED */ |
| 82 | #define TIF_BREAKPOINT 4 /* enter monitor mode on return */ | 82 | #define TIF_BREAKPOINT 4 /* enter monitor mode on return */ |
| 83 | #define TIF_SINGLE_STEP 5 /* single step in progress */ | 83 | #define TIF_SINGLE_STEP 5 /* single step in progress */ |
| 84 | #define TIF_MEMDIE 6 | 84 | #define TIF_MEMDIE 6 /* is terminating due to OOM killer */ |
| 85 | #define TIF_RESTORE_SIGMASK 7 /* restore signal mask in do_signal */ | 85 | #define TIF_RESTORE_SIGMASK 7 /* restore signal mask in do_signal */ |
| 86 | #define TIF_CPU_GOING_TO_SLEEP 8 /* CPU is entering sleep 0 mode */ | 86 | #define TIF_CPU_GOING_TO_SLEEP 8 /* CPU is entering sleep 0 mode */ |
| 87 | #define TIF_NOTIFY_RESUME 9 /* callback before returning to user */ | 87 | #define TIF_NOTIFY_RESUME 9 /* callback before returning to user */ |
diff --git a/arch/blackfin/include/asm/thread_info.h b/arch/blackfin/include/asm/thread_info.h index e9a5614cdbb1..02560fd8a121 100644 --- a/arch/blackfin/include/asm/thread_info.h +++ b/arch/blackfin/include/asm/thread_info.h | |||
| @@ -98,7 +98,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 98 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | 98 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ |
| 99 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling | 99 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling |
| 100 | TIF_NEED_RESCHED */ | 100 | TIF_NEED_RESCHED */ |
| 101 | #define TIF_MEMDIE 4 | 101 | #define TIF_MEMDIE 4 /* is terminating due to OOM killer */ |
| 102 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ | 102 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ |
| 103 | #define TIF_FREEZE 6 /* is freezing for suspend */ | 103 | #define TIF_FREEZE 6 /* is freezing for suspend */ |
| 104 | #define TIF_IRQ_SYNC 7 /* sync pipeline stage */ | 104 | #define TIF_IRQ_SYNC 7 /* sync pipeline stage */ |
diff --git a/arch/cris/include/asm/thread_info.h b/arch/cris/include/asm/thread_info.h index c3aade36c330..91776069ca80 100644 --- a/arch/cris/include/asm/thread_info.h +++ b/arch/cris/include/asm/thread_info.h | |||
| @@ -85,7 +85,7 @@ struct thread_info { | |||
| 85 | #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ | 85 | #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ |
| 86 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ | 86 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ |
| 87 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 87 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 88 | #define TIF_MEMDIE 17 | 88 | #define TIF_MEMDIE 17 /* is terminating due to OOM killer */ |
| 89 | #define TIF_FREEZE 18 /* is freezing for suspend */ | 89 | #define TIF_FREEZE 18 /* is freezing for suspend */ |
| 90 | 90 | ||
| 91 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 91 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
diff --git a/arch/frv/include/asm/thread_info.h b/arch/frv/include/asm/thread_info.h index e608e056bb53..11f33ead29bf 100644 --- a/arch/frv/include/asm/thread_info.h +++ b/arch/frv/include/asm/thread_info.h | |||
| @@ -113,7 +113,7 @@ register struct thread_info *__current_thread_info asm("gr15"); | |||
| 113 | #define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */ | 113 | #define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */ |
| 114 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ | 114 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ |
| 115 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 115 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 116 | #define TIF_MEMDIE 17 /* OOM killer killed process */ | 116 | #define TIF_MEMDIE 17 /* is terminating due to OOM killer */ |
| 117 | #define TIF_FREEZE 18 /* freezing for suspend */ | 117 | #define TIF_FREEZE 18 /* freezing for suspend */ |
| 118 | 118 | ||
| 119 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | 119 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) |
diff --git a/arch/h8300/include/asm/thread_info.h b/arch/h8300/include/asm/thread_info.h index 70e67e47d020..d6f1784bfdee 100644 --- a/arch/h8300/include/asm/thread_info.h +++ b/arch/h8300/include/asm/thread_info.h | |||
| @@ -87,7 +87,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 87 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | 87 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ |
| 88 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling | 88 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling |
| 89 | TIF_NEED_RESCHED */ | 89 | TIF_NEED_RESCHED */ |
| 90 | #define TIF_MEMDIE 4 | 90 | #define TIF_MEMDIE 4 /* is terminating due to OOM killer */ |
| 91 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ | 91 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ |
| 92 | #define TIF_NOTIFY_RESUME 6 /* callback before returning to user */ | 92 | #define TIF_NOTIFY_RESUME 6 /* callback before returning to user */ |
| 93 | #define TIF_FREEZE 16 /* is freezing for suspend */ | 93 | #define TIF_FREEZE 16 /* is freezing for suspend */ |
diff --git a/arch/ia64/include/asm/thread_info.h b/arch/ia64/include/asm/thread_info.h index 8ce2e388e37c..b6a5ba2aca34 100644 --- a/arch/ia64/include/asm/thread_info.h +++ b/arch/ia64/include/asm/thread_info.h | |||
| @@ -102,7 +102,7 @@ struct thread_info { | |||
| 102 | #define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */ | 102 | #define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */ |
| 103 | #define TIF_NOTIFY_RESUME 6 /* resumption notification requested */ | 103 | #define TIF_NOTIFY_RESUME 6 /* resumption notification requested */ |
| 104 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 104 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 105 | #define TIF_MEMDIE 17 | 105 | #define TIF_MEMDIE 17 /* is terminating due to OOM killer */ |
| 106 | #define TIF_MCA_INIT 18 /* this task is processing MCA or INIT */ | 106 | #define TIF_MCA_INIT 18 /* this task is processing MCA or INIT */ |
| 107 | #define TIF_DB_DISABLED 19 /* debug trap disabled for fsyscall */ | 107 | #define TIF_DB_DISABLED 19 /* debug trap disabled for fsyscall */ |
| 108 | #define TIF_FREEZE 20 /* is freezing for suspend */ | 108 | #define TIF_FREEZE 20 /* is freezing for suspend */ |
diff --git a/arch/m32r/include/asm/thread_info.h b/arch/m32r/include/asm/thread_info.h index ed240b6e8e77..71faff5bcc27 100644 --- a/arch/m32r/include/asm/thread_info.h +++ b/arch/m32r/include/asm/thread_info.h | |||
| @@ -142,7 +142,7 @@ static inline unsigned int get_thread_fault_code(void) | |||
| 142 | #define TIF_RESTORE_SIGMASK 8 /* restore signal mask in do_signal() */ | 142 | #define TIF_RESTORE_SIGMASK 8 /* restore signal mask in do_signal() */ |
| 143 | #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ | 143 | #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ |
| 144 | #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 144 | #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 145 | #define TIF_MEMDIE 18 /* OOM killer killed process */ | 145 | #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ |
| 146 | #define TIF_FREEZE 19 /* is freezing for suspend */ | 146 | #define TIF_FREEZE 19 /* is freezing for suspend */ |
| 147 | 147 | ||
| 148 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 148 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
diff --git a/arch/m68k/include/asm/thread_info_mm.h b/arch/m68k/include/asm/thread_info_mm.h index 67266c683453..3bf31dc51b12 100644 --- a/arch/m68k/include/asm/thread_info_mm.h +++ b/arch/m68k/include/asm/thread_info_mm.h | |||
| @@ -65,7 +65,7 @@ struct thread_info { | |||
| 65 | #define TIF_NEED_RESCHED 7 /* rescheduling necessary */ | 65 | #define TIF_NEED_RESCHED 7 /* rescheduling necessary */ |
| 66 | #define TIF_DELAYED_TRACE 14 /* single step a syscall */ | 66 | #define TIF_DELAYED_TRACE 14 /* single step a syscall */ |
| 67 | #define TIF_SYSCALL_TRACE 15 /* syscall trace active */ | 67 | #define TIF_SYSCALL_TRACE 15 /* syscall trace active */ |
| 68 | #define TIF_MEMDIE 16 | 68 | #define TIF_MEMDIE 16 /* is terminating due to OOM killer */ |
| 69 | #define TIF_FREEZE 17 /* thread is freezing for suspend */ | 69 | #define TIF_FREEZE 17 /* thread is freezing for suspend */ |
| 70 | 70 | ||
| 71 | #endif /* _ASM_M68K_THREAD_INFO_H */ | 71 | #endif /* _ASM_M68K_THREAD_INFO_H */ |
diff --git a/arch/m68k/include/asm/thread_info_no.h b/arch/m68k/include/asm/thread_info_no.h index 884776f686ca..51f354b672e6 100644 --- a/arch/m68k/include/asm/thread_info_no.h +++ b/arch/m68k/include/asm/thread_info_no.h | |||
| @@ -85,7 +85,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 85 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | 85 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ |
| 86 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling | 86 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling |
| 87 | TIF_NEED_RESCHED */ | 87 | TIF_NEED_RESCHED */ |
| 88 | #define TIF_MEMDIE 4 | 88 | #define TIF_MEMDIE 4 /* is terminating due to OOM killer */ |
| 89 | #define TIF_FREEZE 16 /* is freezing for suspend */ | 89 | #define TIF_FREEZE 16 /* is freezing for suspend */ |
| 90 | 90 | ||
| 91 | /* as above, but as bit values */ | 91 | /* as above, but as bit values */ |
diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h index b2ca80f64640..8a8e9fc6e0c0 100644 --- a/arch/microblaze/include/asm/thread_info.h +++ b/arch/microblaze/include/asm/thread_info.h | |||
| @@ -122,7 +122,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 122 | /* restore singlestep on return to user mode */ | 122 | /* restore singlestep on return to user mode */ |
| 123 | #define TIF_SINGLESTEP 4 | 123 | #define TIF_SINGLESTEP 4 |
| 124 | #define TIF_IRET 5 /* return with iret */ | 124 | #define TIF_IRET 5 /* return with iret */ |
| 125 | #define TIF_MEMDIE 6 | 125 | #define TIF_MEMDIE 6 /* is terminating due to OOM killer */ |
| 126 | #define TIF_SYSCALL_AUDIT 9 /* syscall auditing active */ | 126 | #define TIF_SYSCALL_AUDIT 9 /* syscall auditing active */ |
| 127 | #define TIF_SECCOMP 10 /* secure computing */ | 127 | #define TIF_SECCOMP 10 /* secure computing */ |
| 128 | #define TIF_FREEZE 14 /* Freezing for suspend */ | 128 | #define TIF_FREEZE 14 /* Freezing for suspend */ |
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h index 845da2107ed1..2376f2e06e47 100644 --- a/arch/mips/include/asm/thread_info.h +++ b/arch/mips/include/asm/thread_info.h | |||
| @@ -112,7 +112,7 @@ register struct thread_info *__current_thread_info __asm__("$28"); | |||
| 112 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ | 112 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ |
| 113 | #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ | 113 | #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ |
| 114 | #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 114 | #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 115 | #define TIF_MEMDIE 18 | 115 | #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ |
| 116 | #define TIF_FREEZE 19 | 116 | #define TIF_FREEZE 19 |
| 117 | #define TIF_FIXADE 20 /* Fix address errors in software */ | 117 | #define TIF_FIXADE 20 /* Fix address errors in software */ |
| 118 | #define TIF_LOGADE 21 /* Log address errors to syslog */ | 118 | #define TIF_LOGADE 21 /* Log address errors to syslog */ |
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index 7a8b0a8b643a..044bbe462c2c 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c | |||
| @@ -253,7 +253,7 @@ void __init init_bcm1480_irqs(void) | |||
| 253 | * On the second cpu, everything is set to IP5, which is | 253 | * On the second cpu, everything is set to IP5, which is |
| 254 | * ignored, EXCEPT the mailbox interrupt. That one is | 254 | * ignored, EXCEPT the mailbox interrupt. That one is |
| 255 | * set to IP[2] so it is handled. This is needed so we | 255 | * set to IP[2] so it is handled. This is needed so we |
| 256 | * can do cross-cpu function calls, as requred by SMP | 256 | * can do cross-cpu function calls, as required by SMP |
| 257 | */ | 257 | */ |
| 258 | 258 | ||
| 259 | #define IMR_IP2_VAL K_BCM1480_INT_MAP_I0 | 259 | #define IMR_IP2_VAL K_BCM1480_INT_MAP_I0 |
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index 62371f772553..12ac04a658ee 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c | |||
| @@ -236,7 +236,7 @@ void __init init_sb1250_irqs(void) | |||
| 236 | * On the second cpu, everything is set to IP5, which is | 236 | * On the second cpu, everything is set to IP5, which is |
| 237 | * ignored, EXCEPT the mailbox interrupt. That one is | 237 | * ignored, EXCEPT the mailbox interrupt. That one is |
| 238 | * set to IP[2] so it is handled. This is needed so we | 238 | * set to IP[2] so it is handled. This is needed so we |
| 239 | * can do cross-cpu function calls, as requred by SMP | 239 | * can do cross-cpu function calls, as required by SMP |
| 240 | */ | 240 | */ |
| 241 | 241 | ||
| 242 | #define IMR_IP2_VAL K_INT_MAP_I0 | 242 | #define IMR_IP2_VAL K_INT_MAP_I0 |
diff --git a/arch/mn10300/include/asm/thread_info.h b/arch/mn10300/include/asm/thread_info.h index 58d64f8b2cc3..2001cb657a95 100644 --- a/arch/mn10300/include/asm/thread_info.h +++ b/arch/mn10300/include/asm/thread_info.h | |||
| @@ -148,7 +148,7 @@ static inline unsigned long current_stack_pointer(void) | |||
| 148 | #define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */ | 148 | #define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */ |
| 149 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ | 149 | #define TIF_RESTORE_SIGMASK 5 /* restore signal mask in do_signal() */ |
| 150 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 150 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 151 | #define TIF_MEMDIE 17 /* OOM killer killed process */ | 151 | #define TIF_MEMDIE 17 /* is terminating due to OOM killer */ |
| 152 | #define TIF_FREEZE 18 /* freezing for suspend */ | 152 | #define TIF_FREEZE 18 /* freezing for suspend */ |
| 153 | 153 | ||
| 154 | #define _TIF_SYSCALL_TRACE +(1 << TIF_SYSCALL_TRACE) | 154 | #define _TIF_SYSCALL_TRACE +(1 << TIF_SYSCALL_TRACE) |
diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h index 7ecc1039cfed..aa8de727e90b 100644 --- a/arch/parisc/include/asm/thread_info.h +++ b/arch/parisc/include/asm/thread_info.h | |||
| @@ -56,7 +56,7 @@ struct thread_info { | |||
| 56 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | 56 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ |
| 57 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 57 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 58 | #define TIF_32BIT 4 /* 32 bit binary */ | 58 | #define TIF_32BIT 4 /* 32 bit binary */ |
| 59 | #define TIF_MEMDIE 5 | 59 | #define TIF_MEMDIE 5 /* is terminating due to OOM killer */ |
| 60 | #define TIF_RESTORE_SIGMASK 6 /* restore saved signal mask */ | 60 | #define TIF_RESTORE_SIGMASK 6 /* restore saved signal mask */ |
| 61 | #define TIF_FREEZE 7 /* is freezing for suspend */ | 61 | #define TIF_FREEZE 7 /* is freezing for suspend */ |
| 62 | #define TIF_NOTIFY_RESUME 8 /* callback before returning to user */ | 62 | #define TIF_NOTIFY_RESUME 8 /* callback before returning to user */ |
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h index aa9d383a1c09..65eb85976a03 100644 --- a/arch/powerpc/include/asm/thread_info.h +++ b/arch/powerpc/include/asm/thread_info.h | |||
| @@ -104,7 +104,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 104 | #define TIF_PERFMON_CTXSW 6 /* perfmon needs ctxsw calls */ | 104 | #define TIF_PERFMON_CTXSW 6 /* perfmon needs ctxsw calls */ |
| 105 | #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ | 105 | #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ |
| 106 | #define TIF_SINGLESTEP 8 /* singlestepping active */ | 106 | #define TIF_SINGLESTEP 8 /* singlestepping active */ |
| 107 | #define TIF_MEMDIE 9 | 107 | #define TIF_MEMDIE 9 /* is terminating due to OOM killer */ |
| 108 | #define TIF_SECCOMP 10 /* secure computing */ | 108 | #define TIF_SECCOMP 10 /* secure computing */ |
| 109 | #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */ | 109 | #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */ |
| 110 | #define TIF_NOERROR 12 /* Force successful syscall return */ | 110 | #define TIF_NOERROR 12 /* Force successful syscall return */ |
diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c index 57e5b608fa1a..174a04ac4806 100644 --- a/arch/powerpc/platforms/embedded6xx/wii.c +++ b/arch/powerpc/platforms/embedded6xx/wii.c | |||
| @@ -69,10 +69,10 @@ void __init wii_memory_fixups(void) | |||
| 69 | 69 | ||
| 70 | /* | 70 | /* |
| 71 | * This is part of a workaround to allow the use of two | 71 | * This is part of a workaround to allow the use of two |
| 72 | * discontiguous RAM ranges on the Wii, even if this is | 72 | * discontinuous RAM ranges on the Wii, even if this is |
| 73 | * currently unsupported on 32-bit PowerPC Linux. | 73 | * currently unsupported on 32-bit PowerPC Linux. |
| 74 | * | 74 | * |
| 75 | * We coealesce the two memory ranges of the Wii into a | 75 | * We coalesce the two memory ranges of the Wii into a |
| 76 | * single range, then create a reservation for the "hole" | 76 | * single range, then create a reservation for the "hole" |
| 77 | * between both ranges. | 77 | * between both ranges. |
| 78 | */ | 78 | */ |
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h index be3d3f91d86c..5baf0230b29b 100644 --- a/arch/s390/include/asm/thread_info.h +++ b/arch/s390/include/asm/thread_info.h | |||
| @@ -97,7 +97,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 97 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling | 97 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling |
| 98 | TIF_NEED_RESCHED */ | 98 | TIF_NEED_RESCHED */ |
| 99 | #define TIF_31BIT 17 /* 32bit process */ | 99 | #define TIF_31BIT 17 /* 32bit process */ |
| 100 | #define TIF_MEMDIE 18 | 100 | #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ |
| 101 | #define TIF_RESTORE_SIGMASK 19 /* restore signal mask in do_signal() */ | 101 | #define TIF_RESTORE_SIGMASK 19 /* restore signal mask in do_signal() */ |
| 102 | #define TIF_FREEZE 20 /* thread is freezing for suspend */ | 102 | #define TIF_FREEZE 20 /* thread is freezing for suspend */ |
| 103 | 103 | ||
diff --git a/arch/score/include/asm/thread_info.h b/arch/score/include/asm/thread_info.h index 55939992c27d..8570d08f58c1 100644 --- a/arch/score/include/asm/thread_info.h +++ b/arch/score/include/asm/thread_info.h | |||
| @@ -92,7 +92,7 @@ register struct thread_info *__current_thread_info __asm__("r28"); | |||
| 92 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ | 92 | #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ |
| 93 | #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling | 93 | #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling |
| 94 | TIF_NEED_RESCHED */ | 94 | TIF_NEED_RESCHED */ |
| 95 | #define TIF_MEMDIE 18 | 95 | #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ |
| 96 | 96 | ||
| 97 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) | 97 | #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
| 98 | #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) | 98 | #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) |
diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h index 55a36fef6875..c228946926ed 100644 --- a/arch/sh/include/asm/thread_info.h +++ b/arch/sh/include/asm/thread_info.h | |||
| @@ -121,7 +121,7 @@ extern void init_thread_xstate(void); | |||
| 121 | #define TIF_NOTIFY_RESUME 7 /* callback before returning to user */ | 121 | #define TIF_NOTIFY_RESUME 7 /* callback before returning to user */ |
| 122 | #define TIF_SYSCALL_TRACEPOINT 8 /* for ftrace syscall instrumentation */ | 122 | #define TIF_SYSCALL_TRACEPOINT 8 /* for ftrace syscall instrumentation */ |
| 123 | #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 123 | #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 124 | #define TIF_MEMDIE 18 | 124 | #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ |
| 125 | #define TIF_FREEZE 19 /* Freezing for suspend */ | 125 | #define TIF_FREEZE 19 /* Freezing for suspend */ |
| 126 | 126 | ||
| 127 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | 127 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) |
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h index 844d73a0340c..9dd0318d3ddf 100644 --- a/arch/sparc/include/asm/thread_info_32.h +++ b/arch/sparc/include/asm/thread_info_32.h | |||
| @@ -132,7 +132,7 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *) | |||
| 132 | * this quantum (SMP) */ | 132 | * this quantum (SMP) */ |
| 133 | #define TIF_POLLING_NRFLAG 9 /* true if poll_idle() is polling | 133 | #define TIF_POLLING_NRFLAG 9 /* true if poll_idle() is polling |
| 134 | * TIF_NEED_RESCHED */ | 134 | * TIF_NEED_RESCHED */ |
| 135 | #define TIF_MEMDIE 10 | 135 | #define TIF_MEMDIE 10 /* is terminating due to OOM killer */ |
| 136 | #define TIF_FREEZE 11 /* is freezing for suspend */ | 136 | #define TIF_FREEZE 11 /* is freezing for suspend */ |
| 137 | 137 | ||
| 138 | /* as above, but as bit values */ | 138 | /* as above, but as bit values */ |
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h index 4827a3aeac7f..fb2ea7705a46 100644 --- a/arch/sparc/include/asm/thread_info_64.h +++ b/arch/sparc/include/asm/thread_info_64.h | |||
| @@ -223,7 +223,7 @@ register struct thread_info *current_thread_info_reg asm("g6"); | |||
| 223 | * an immediate value in instructions such as andcc. | 223 | * an immediate value in instructions such as andcc. |
| 224 | */ | 224 | */ |
| 225 | /* flag bit 12 is available */ | 225 | /* flag bit 12 is available */ |
| 226 | #define TIF_MEMDIE 13 | 226 | #define TIF_MEMDIE 13 /* is terminating due to OOM killer */ |
| 227 | #define TIF_POLLING_NRFLAG 14 | 227 | #define TIF_POLLING_NRFLAG 14 |
| 228 | #define TIF_FREEZE 15 /* is freezing for suspend */ | 228 | #define TIF_FREEZE 15 /* is freezing for suspend */ |
| 229 | 229 | ||
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 7a656bd8bd3c..7f7338c90784 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
| @@ -19,7 +19,6 @@ static irqreturn_t line_interrupt(int irq, void *data) | |||
| 19 | { | 19 | { |
| 20 | struct chan *chan = data; | 20 | struct chan *chan = data; |
| 21 | struct line *line = chan->line; | 21 | struct line *line = chan->line; |
| 22 | struct tty_struct *tty; | ||
| 23 | 22 | ||
| 24 | if (line) | 23 | if (line) |
| 25 | chan_interrupt(&line->chan_list, &line->task, line->tty, irq); | 24 | chan_interrupt(&line->chan_list, &line->task, line->tty, irq); |
diff --git a/arch/um/include/asm/system.h b/arch/um/include/asm/system.h index 753346e2cdfd..93af1cf0907d 100644 --- a/arch/um/include/asm/system.h +++ b/arch/um/include/asm/system.h | |||
| @@ -3,11 +3,8 @@ | |||
| 3 | 3 | ||
| 4 | #include "sysdep/system.h" | 4 | #include "sysdep/system.h" |
| 5 | 5 | ||
| 6 | extern void *switch_to(void *prev, void *next, void *last); | ||
| 7 | |||
| 8 | extern int get_signals(void); | 6 | extern int get_signals(void); |
| 9 | extern int set_signals(int enable); | 7 | extern int set_signals(int enable); |
| 10 | extern int get_signals(void); | ||
| 11 | extern void block_signals(void); | 8 | extern void block_signals(void); |
| 12 | extern void unblock_signals(void); | 9 | extern void unblock_signals(void); |
| 13 | 10 | ||
diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h index fd911f855367..e2cf786bda0a 100644 --- a/arch/um/include/asm/thread_info.h +++ b/arch/um/include/asm/thread_info.h | |||
| @@ -63,10 +63,9 @@ static inline struct thread_info *current_thread_info(void) | |||
| 63 | #define TIF_SIGPENDING 1 /* signal pending */ | 63 | #define TIF_SIGPENDING 1 /* signal pending */ |
| 64 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | 64 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ |
| 65 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling | 65 | #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling |
| 66 | * TIF_NEED_RESCHED | 66 | * TIF_NEED_RESCHED */ |
| 67 | */ | 67 | #define TIF_RESTART_BLOCK 4 |
| 68 | #define TIF_RESTART_BLOCK 4 | 68 | #define TIF_MEMDIE 5 /* is terminating due to OOM killer */ |
| 69 | #define TIF_MEMDIE 5 | ||
| 70 | #define TIF_SYSCALL_AUDIT 6 | 69 | #define TIF_SYSCALL_AUDIT 6 |
| 71 | #define TIF_RESTORE_SIGMASK 7 | 70 | #define TIF_RESTORE_SIGMASK 7 |
| 72 | #define TIF_FREEZE 16 /* is freezing for suspend */ | 71 | #define TIF_FREEZE 16 /* is freezing for suspend */ |
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c index 4e3b820bd2be..f5173e1ec3ac 100644 --- a/arch/um/kernel/skas/syscall.c +++ b/arch/um/kernel/skas/syscall.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include "sysdep/syscalls.h" | 10 | #include "sysdep/syscalls.h" |
| 11 | 11 | ||
| 12 | extern int syscall_table_size; | 12 | extern int syscall_table_size; |
| 13 | #define NR_syscalls (syscall_table_size / sizeof(void *)) | 13 | #define NR_SYSCALLS (syscall_table_size / sizeof(void *)) |
| 14 | 14 | ||
| 15 | void handle_syscall(struct uml_pt_regs *r) | 15 | void handle_syscall(struct uml_pt_regs *r) |
| 16 | { | 16 | { |
| @@ -30,7 +30,7 @@ void handle_syscall(struct uml_pt_regs *r) | |||
| 30 | * in case it's a compiler bug. | 30 | * in case it's a compiler bug. |
| 31 | */ | 31 | */ |
| 32 | syscall = UPT_SYSCALL_NR(r); | 32 | syscall = UPT_SYSCALL_NR(r); |
| 33 | if ((syscall >= NR_syscalls) || (syscall < 0)) | 33 | if ((syscall >= NR_SYSCALLS) || (syscall < 0)) |
| 34 | result = -ENOSYS; | 34 | result = -ENOSYS; |
| 35 | else result = EXECUTE_SYSCALL(syscall, regs); | 35 | else result = EXECUTE_SYSCALL(syscall, regs); |
| 36 | 36 | ||
diff --git a/arch/um/sys-i386/asm/elf.h b/arch/um/sys-i386/asm/elf.h index e64cd41d7bab..a979a22a8d9f 100644 --- a/arch/um/sys-i386/asm/elf.h +++ b/arch/um/sys-i386/asm/elf.h | |||
| @@ -75,6 +75,8 @@ typedef struct user_i387_struct elf_fpregset_t; | |||
| 75 | pr_reg[16] = PT_REGS_SS(regs); \ | 75 | pr_reg[16] = PT_REGS_SS(regs); \ |
| 76 | } while (0); | 76 | } while (0); |
| 77 | 77 | ||
| 78 | struct task_struct; | ||
| 79 | |||
| 78 | extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu); | 80 | extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu); |
| 79 | 81 | ||
| 80 | #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu) | 82 | #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu) |
diff --git a/arch/um/sys-x86_64/asm/elf.h b/arch/um/sys-x86_64/asm/elf.h index 49655c83efd2..d760967f33a7 100644 --- a/arch/um/sys-x86_64/asm/elf.h +++ b/arch/um/sys-x86_64/asm/elf.h | |||
| @@ -95,6 +95,8 @@ typedef struct user_i387_struct elf_fpregset_t; | |||
| 95 | (pr_reg)[25] = 0; \ | 95 | (pr_reg)[25] = 0; \ |
| 96 | (pr_reg)[26] = 0; | 96 | (pr_reg)[26] = 0; |
| 97 | 97 | ||
| 98 | struct task_struct; | ||
| 99 | |||
| 98 | extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu); | 100 | extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu); |
| 99 | 101 | ||
| 100 | #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu) | 102 | #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu) |
diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c index 1a899a7ed7a6..b6b65c7c7a7d 100644 --- a/arch/um/sys-x86_64/signal.c +++ b/arch/um/sys-x86_64/signal.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/personality.h> | 7 | #include <linux/personality.h> |
| 8 | #include <linux/ptrace.h> | 8 | #include <linux/ptrace.h> |
| 9 | #include <linux/kernel.h> | ||
| 9 | #include <asm/unistd.h> | 10 | #include <asm/unistd.h> |
| 10 | #include <asm/uaccess.h> | 11 | #include <asm/uaccess.h> |
| 11 | #include <asm/ucontext.h> | 12 | #include <asm/ucontext.h> |
| @@ -165,8 +166,6 @@ struct rt_sigframe | |||
| 165 | struct _fpstate fpstate; | 166 | struct _fpstate fpstate; |
| 166 | }; | 167 | }; |
| 167 | 168 | ||
| 168 | #define round_down(m, n) (((m) / (n)) * (n)) | ||
| 169 | |||
| 170 | int setup_signal_stack_si(unsigned long stack_top, int sig, | 169 | int setup_signal_stack_si(unsigned long stack_top, int sig, |
| 171 | struct k_sigaction *ka, struct pt_regs * regs, | 170 | struct k_sigaction *ka, struct pt_regs * regs, |
| 172 | siginfo_t *info, sigset_t *set) | 171 | siginfo_t *info, sigset_t *set) |
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index 0ec6d12d84e6..0797e748d280 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h | |||
| @@ -105,7 +105,7 @@ do { \ | |||
| 105 | 105 | ||
| 106 | /* | 106 | /* |
| 107 | * Generate a percpu add to memory instruction and optimize code | 107 | * Generate a percpu add to memory instruction and optimize code |
| 108 | * if a one is added or subtracted. | 108 | * if one is added or subtracted. |
| 109 | */ | 109 | */ |
| 110 | #define percpu_add_op(var, val) \ | 110 | #define percpu_add_op(var, val) \ |
| 111 | do { \ | 111 | do { \ |
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index d4092fac226b..62ba9400cc43 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h | |||
| @@ -87,7 +87,7 @@ struct thread_info { | |||
| 87 | #define TIF_NOTSC 16 /* TSC is not accessible in userland */ | 87 | #define TIF_NOTSC 16 /* TSC is not accessible in userland */ |
| 88 | #define TIF_IA32 17 /* 32bit process */ | 88 | #define TIF_IA32 17 /* 32bit process */ |
| 89 | #define TIF_FORK 18 /* ret_from_fork */ | 89 | #define TIF_FORK 18 /* ret_from_fork */ |
| 90 | #define TIF_MEMDIE 20 | 90 | #define TIF_MEMDIE 20 /* is terminating due to OOM killer */ |
| 91 | #define TIF_DEBUG 21 /* uses debug registers */ | 91 | #define TIF_DEBUG 21 /* uses debug registers */ |
| 92 | #define TIF_IO_BITMAP 22 /* uses I/O bitmap */ | 92 | #define TIF_IO_BITMAP 22 /* uses I/O bitmap */ |
| 93 | #define TIF_FREEZE 23 /* is freezing for suspend */ | 93 | #define TIF_FREEZE 23 /* is freezing for suspend */ |
diff --git a/arch/xtensa/include/asm/thread_info.h b/arch/xtensa/include/asm/thread_info.h index 13165641cc51..7be8accb0b0c 100644 --- a/arch/xtensa/include/asm/thread_info.h +++ b/arch/xtensa/include/asm/thread_info.h | |||
| @@ -129,7 +129,7 @@ static inline struct thread_info *current_thread_info(void) | |||
| 129 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | 129 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ |
| 130 | #define TIF_SINGLESTEP 3 /* restore singlestep on return to user mode */ | 130 | #define TIF_SINGLESTEP 3 /* restore singlestep on return to user mode */ |
| 131 | #define TIF_IRET 4 /* return with iret */ | 131 | #define TIF_IRET 4 /* return with iret */ |
| 132 | #define TIF_MEMDIE 5 | 132 | #define TIF_MEMDIE 5 /* is terminating due to OOM killer */ |
| 133 | #define TIF_RESTORE_SIGMASK 6 /* restore signal mask in do_signal() */ | 133 | #define TIF_RESTORE_SIGMASK 6 /* restore signal mask in do_signal() */ |
| 134 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ | 134 | #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ |
| 135 | #define TIF_FREEZE 17 /* is freezing for suspend */ | 135 | #define TIF_FREEZE 17 /* is freezing for suspend */ |
diff --git a/crypto/Kconfig b/crypto/Kconfig index 403857ad06d4..9d9434f08c92 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -28,7 +28,7 @@ config CRYPTO_FIPS | |||
| 28 | This options enables the fips boot option which is | 28 | This options enables the fips boot option which is |
| 29 | required if you want to system to operate in a FIPS 200 | 29 | required if you want to system to operate in a FIPS 200 |
| 30 | certification. You should say no unless you know what | 30 | certification. You should say no unless you know what |
| 31 | this is. Note that CRYPTO_ANSI_CPRNG is requred if this | 31 | this is. Note that CRYPTO_ANSI_CPRNG is required if this |
| 32 | option is selected | 32 | option is selected |
| 33 | 33 | ||
| 34 | config CRYPTO_ALGAPI | 34 | config CRYPTO_ALGAPI |
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 7594f65800cf..4bc1c4178f50 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -1406,7 +1406,7 @@ acpi_os_invalidate_address( | |||
| 1406 | switch (space_id) { | 1406 | switch (space_id) { |
| 1407 | case ACPI_ADR_SPACE_SYSTEM_IO: | 1407 | case ACPI_ADR_SPACE_SYSTEM_IO: |
| 1408 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: | 1408 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: |
| 1409 | /* Only interference checks against SystemIO and SytemMemory | 1409 | /* Only interference checks against SystemIO and SystemMemory |
| 1410 | are needed */ | 1410 | are needed */ |
| 1411 | res.start = address; | 1411 | res.start = address; |
| 1412 | res.end = address + length - 1; | 1412 | res.end = address + length - 1; |
| @@ -1458,7 +1458,7 @@ acpi_os_validate_address ( | |||
| 1458 | switch (space_id) { | 1458 | switch (space_id) { |
| 1459 | case ACPI_ADR_SPACE_SYSTEM_IO: | 1459 | case ACPI_ADR_SPACE_SYSTEM_IO: |
| 1460 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: | 1460 | case ACPI_ADR_SPACE_SYSTEM_MEMORY: |
| 1461 | /* Only interference checks against SystemIO and SytemMemory | 1461 | /* Only interference checks against SystemIO and SystemMemory |
| 1462 | are needed */ | 1462 | are needed */ |
| 1463 | res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL); | 1463 | res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL); |
| 1464 | if (!res) | 1464 | if (!res) |
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index ddc76787b842..f74d3b31e5c9 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
| @@ -172,7 +172,6 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state) | |||
| 172 | return -EINVAL; | 172 | return -EINVAL; |
| 173 | 173 | ||
| 174 | /* The state of the list is 'on' IFF all resources are 'on'. */ | 174 | /* The state of the list is 'on' IFF all resources are 'on'. */ |
| 175 | /* */ | ||
| 176 | 175 | ||
| 177 | for (i = 0; i < list->count; i++) { | 176 | for (i = 0; i < list->count; i++) { |
| 178 | /* | 177 | /* |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 83bc49fac9bb..ec52fc618763 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | * driver the list of errata that are relevant is below, going back to | 43 | * driver the list of errata that are relevant is below, going back to |
| 44 | * PIIX4. Older device documentation is now a bit tricky to find. | 44 | * PIIX4. Older device documentation is now a bit tricky to find. |
| 45 | * | 45 | * |
| 46 | * The chipsets all follow very much the same design. The orginal Triton | 46 | * The chipsets all follow very much the same design. The original Triton |
| 47 | * series chipsets do _not_ support independant device timings, but this | 47 | * series chipsets do _not_ support independant device timings, but this |
| 48 | * is fixed in Triton II. With the odd mobile exception the chips then | 48 | * is fixed in Triton II. With the odd mobile exception the chips then |
| 49 | * change little except in gaining more modes until SATA arrives. This | 49 | * change little except in gaining more modes until SATA arrives. This |
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index eb5ff0531cfb..51ceaee98f9f 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -1588,7 +1588,6 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, | |||
| 1588 | 1588 | ||
| 1589 | c->Request = ioc->Request; | 1589 | c->Request = ioc->Request; |
| 1590 | if (ioc->buf_size > 0) { | 1590 | if (ioc->buf_size > 0) { |
| 1591 | int i; | ||
| 1592 | for (i = 0; i < sg_used; i++) { | 1591 | for (i = 0; i < sg_used; i++) { |
| 1593 | temp64.val = | 1592 | temp64.val = |
| 1594 | pci_map_single(host->pdev, buff[i], | 1593 | pci_map_single(host->pdev, buff[i], |
| @@ -2434,7 +2433,7 @@ static int deregister_disk(ctlr_info_t *h, int drv_index, | |||
| 2434 | 2433 | ||
| 2435 | /* if it was the last disk, find the new hightest lun */ | 2434 | /* if it was the last disk, find the new hightest lun */ |
| 2436 | if (clear_all && recalculate_highest_lun) { | 2435 | if (clear_all && recalculate_highest_lun) { |
| 2437 | int i, newhighest = -1; | 2436 | int newhighest = -1; |
| 2438 | for (i = 0; i <= h->highest_lun; i++) { | 2437 | for (i = 0; i <= h->highest_lun; i++) { |
| 2439 | /* if the disk has size > 0, it is available */ | 2438 | /* if the disk has size > 0, it is available */ |
| 2440 | if (h->drv[i] && h->drv[i]->heads) | 2439 | if (h->drv[i] && h->drv[i]->heads) |
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index fb86708e47ed..4b51982fd23a 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
| @@ -1214,7 +1214,7 @@ struct agp_memory *agp_generic_alloc_user(size_t page_count, int type) | |||
| 1214 | return NULL; | 1214 | return NULL; |
| 1215 | 1215 | ||
| 1216 | for (i = 0; i < page_count; i++) | 1216 | for (i = 0; i < page_count; i++) |
| 1217 | new->pages[i] = 0; | 1217 | new->pages[i] = NULL; |
| 1218 | new->page_count = 0; | 1218 | new->page_count = 0; |
| 1219 | new->type = type; | 1219 | new->type = type; |
| 1220 | new->num_scratch_pages = pages; | 1220 | new->num_scratch_pages = pages; |
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c index 7fef305774de..89d871ef8c2f 100644 --- a/drivers/char/bsr.c +++ b/drivers/char/bsr.c | |||
| @@ -253,7 +253,7 @@ static int bsr_add_node(struct device_node *bn) | |||
| 253 | 253 | ||
| 254 | cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev, | 254 | cur->bsr_device = device_create(bsr_class, NULL, cur->bsr_dev, |
| 255 | cur, cur->bsr_name); | 255 | cur, cur->bsr_name); |
| 256 | if (!cur->bsr_device) { | 256 | if (IS_ERR(cur->bsr_device)) { |
| 257 | printk(KERN_ERR "device_create failed for %s\n", | 257 | printk(KERN_ERR "device_create failed for %s\n", |
| 258 | cur->bsr_name); | 258 | cur->bsr_name); |
| 259 | cdev_del(&cur->bsr_cdev); | 259 | cdev_del(&cur->bsr_cdev); |
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 94b16e0340ae..a3b083a7403a 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
| @@ -1351,7 +1351,7 @@ static void bus_reset_tasklet(unsigned long data) | |||
| 1351 | * was set up before this reset, the old one is now no longer | 1351 | * was set up before this reset, the old one is now no longer |
| 1352 | * in use and we can free it. Update the config rom pointers | 1352 | * in use and we can free it. Update the config rom pointers |
| 1353 | * to point to the current config rom and clear the | 1353 | * to point to the current config rom and clear the |
| 1354 | * next_config_rom pointer so a new udpate can take place. | 1354 | * next_config_rom pointer so a new update can take place. |
| 1355 | */ | 1355 | */ |
| 1356 | 1356 | ||
| 1357 | if (ohci->next_config_rom != NULL) { | 1357 | if (ohci->next_config_rom != NULL) { |
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index f7ba82ebf65a..2092e7bb788f 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c | |||
| @@ -961,7 +961,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) | |||
| 961 | dma->buflist[i + dma->buf_count] = &entry->buflist[i]; | 961 | dma->buflist[i + dma->buf_count] = &entry->buflist[i]; |
| 962 | } | 962 | } |
| 963 | 963 | ||
| 964 | /* No allocations failed, so now we can replace the orginal pagelist | 964 | /* No allocations failed, so now we can replace the original pagelist |
| 965 | * with the new one. | 965 | * with the new one. |
| 966 | */ | 966 | */ |
| 967 | if (dma->page_count) { | 967 | if (dma->page_count) { |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c7502b6b1600..f27e3703a716 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -905,9 +905,9 @@ intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc, | |||
| 905 | 905 | ||
| 906 | memset(best_clock, 0, sizeof(*best_clock)); | 906 | memset(best_clock, 0, sizeof(*best_clock)); |
| 907 | max_n = limit->n.max; | 907 | max_n = limit->n.max; |
| 908 | /* based on hardware requriment prefer smaller n to precision */ | 908 | /* based on hardware requirement, prefer smaller n to precision */ |
| 909 | for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) { | 909 | for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) { |
| 910 | /* based on hardware requirment prefere larger m1,m2 */ | 910 | /* based on hardware requirement, prefere larger m1,m2 */ |
| 911 | for (clock.m1 = limit->m1.max; | 911 | for (clock.m1 = limit->m1.max; |
| 912 | clock.m1 >= limit->m1.min; clock.m1--) { | 912 | clock.m1 >= limit->m1.min; clock.m1--) { |
| 913 | for (clock.m2 = limit->m2.max; | 913 | for (clock.m2 = limit->m2.max; |
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h index 27e2c715be11..5319d9e2f7ba 100644 --- a/drivers/gpu/drm/radeon/atombios.h +++ b/drivers/gpu/drm/radeon/atombios.h | |||
| @@ -3780,7 +3780,7 @@ typedef struct _ATOM_ASIC_SS_ASSIGNMENT | |||
| 3780 | UCHAR ucReserved[2]; | 3780 | UCHAR ucReserved[2]; |
| 3781 | }ATOM_ASIC_SS_ASSIGNMENT; | 3781 | }ATOM_ASIC_SS_ASSIGNMENT; |
| 3782 | 3782 | ||
| 3783 | //Define ucClockIndication, SW uses the IDs below to search if the SS is requried/enabled on a clock branch/signal type. | 3783 | //Define ucClockIndication, SW uses the IDs below to search if the SS is required/enabled on a clock branch/signal type. |
| 3784 | //SS is not required or enabled if a match is not found. | 3784 | //SS is not required or enabled if a match is not found. |
| 3785 | #define ASIC_INTERNAL_MEMORY_SS 1 | 3785 | #define ASIC_INTERNAL_MEMORY_SS 1 |
| 3786 | #define ASIC_INTERNAL_ENGINE_SS 2 | 3786 | #define ASIC_INTERNAL_ENGINE_SS 2 |
| @@ -5895,7 +5895,7 @@ typedef struct _ATOM_PPLIB_RS780_CLOCK_INFO | |||
| 5895 | UCHAR ucPadding; // For proper alignment and size. | 5895 | UCHAR ucPadding; // For proper alignment and size. |
| 5896 | USHORT usVDDC; // For the 780, use: None, Low, High, Variable | 5896 | USHORT usVDDC; // For the 780, use: None, Low, High, Variable |
| 5897 | UCHAR ucMaxHTLinkWidth; // From SBIOS - {2, 4, 8, 16} | 5897 | UCHAR ucMaxHTLinkWidth; // From SBIOS - {2, 4, 8, 16} |
| 5898 | UCHAR ucMinHTLinkWidth; // From SBIOS - {2, 4, 8, 16}. Effective only if CDLW enabled. Minimum down stream width could be bigger as display BW requriement. | 5898 | UCHAR ucMinHTLinkWidth; // From SBIOS - {2, 4, 8, 16}. Effective only if CDLW enabled. Minimum down stream width could be bigger as display BW requirement. |
| 5899 | USHORT usHTLinkFreq; // See definition ATOM_PPLIB_RS780_HTLINKFREQ_xxx or in MHz(>=200). | 5899 | USHORT usHTLinkFreq; // See definition ATOM_PPLIB_RS780_HTLINKFREQ_xxx or in MHz(>=200). |
| 5900 | ULONG ulFlags; | 5900 | ULONG ulFlags; |
| 5901 | } ATOM_PPLIB_RS780_CLOCK_INFO; | 5901 | } ATOM_PPLIB_RS780_CLOCK_INFO; |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c index 37d12e5efa49..1d7aea132a09 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c | |||
| @@ -1474,7 +1474,7 @@ static void ipath_ht_quiet_serdes(struct ipath_devdata *dd) | |||
| 1474 | /** | 1474 | /** |
| 1475 | * ipath_pe_put_tid - write a TID in chip | 1475 | * ipath_pe_put_tid - write a TID in chip |
| 1476 | * @dd: the infinipath device | 1476 | * @dd: the infinipath device |
| 1477 | * @tidptr: pointer to the expected TID (in chip) to udpate | 1477 | * @tidptr: pointer to the expected TID (in chip) to update |
| 1478 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected | 1478 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected |
| 1479 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing | 1479 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing |
| 1480 | * | 1480 | * |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c index fbf8c5379ea8..4b4a30b0dabd 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6120.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c | |||
| @@ -1328,7 +1328,7 @@ bail: | |||
| 1328 | /** | 1328 | /** |
| 1329 | * ipath_pe_put_tid - write a TID in chip | 1329 | * ipath_pe_put_tid - write a TID in chip |
| 1330 | * @dd: the infinipath device | 1330 | * @dd: the infinipath device |
| 1331 | * @tidptr: pointer to the expected TID (in chip) to udpate | 1331 | * @tidptr: pointer to the expected TID (in chip) to update |
| 1332 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected | 1332 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected |
| 1333 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing | 1333 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing |
| 1334 | * | 1334 | * |
| @@ -1394,7 +1394,7 @@ static void ipath_pe_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr, | |||
| 1394 | /** | 1394 | /** |
| 1395 | * ipath_pe_put_tid_2 - write a TID in chip, Revision 2 or higher | 1395 | * ipath_pe_put_tid_2 - write a TID in chip, Revision 2 or higher |
| 1396 | * @dd: the infinipath device | 1396 | * @dd: the infinipath device |
| 1397 | * @tidptr: pointer to the expected TID (in chip) to udpate | 1397 | * @tidptr: pointer to the expected TID (in chip) to update |
| 1398 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected | 1398 | * @tidtype: RCVHQ_RCV_TYPE_EAGER (1) for eager, RCVHQ_RCV_TYPE_EXPECTED (0) for expected |
| 1399 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing | 1399 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing |
| 1400 | * | 1400 | * |
diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c index a805402dd4ae..34b778ed97fc 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba7220.c +++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c | |||
| @@ -1738,7 +1738,7 @@ bail: | |||
| 1738 | /** | 1738 | /** |
| 1739 | * ipath_7220_put_tid - write a TID to the chip | 1739 | * ipath_7220_put_tid - write a TID to the chip |
| 1740 | * @dd: the infinipath device | 1740 | * @dd: the infinipath device |
| 1741 | * @tidptr: pointer to the expected TID (in chip) to udpate | 1741 | * @tidptr: pointer to the expected TID (in chip) to update |
| 1742 | * @tidtype: 0 for eager, 1 for expected | 1742 | * @tidtype: 0 for eager, 1 for expected |
| 1743 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing | 1743 | * @pa: physical address of in memory buffer; ipath_tidinvalid if freeing |
| 1744 | * | 1744 | * |
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index 75e71b5d9215..095ed76ebe80 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c | |||
| @@ -117,7 +117,7 @@ | |||
| 117 | * NOTE: only one mode value must be given for every card. | 117 | * NOTE: only one mode value must be given for every card. |
| 118 | * -> See hfc_multi.h for HFC_IO_MODE_* values | 118 | * -> See hfc_multi.h for HFC_IO_MODE_* values |
| 119 | * By default, the IO mode is pci memory IO (MEMIO). | 119 | * By default, the IO mode is pci memory IO (MEMIO). |
| 120 | * Some cards requre specific IO mode, so it cannot be changed. | 120 | * Some cards require specific IO mode, so it cannot be changed. |
| 121 | * It may be usefull to set IO mode to register io (REGIO) to solve | 121 | * It may be usefull to set IO mode to register io (REGIO) to solve |
| 122 | * PCI bridge problems. | 122 | * PCI bridge problems. |
| 123 | * If unsure, don't give this parameter. | 123 | * If unsure, don't give this parameter. |
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index 051b44e2556c..384d5118e325 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c | |||
| @@ -310,7 +310,7 @@ wait_busy(hfc4s8s_hw * a) | |||
| 310 | 310 | ||
| 311 | /******************************************************/ | 311 | /******************************************************/ |
| 312 | /* function to read critical counter registers that */ | 312 | /* function to read critical counter registers that */ |
| 313 | /* may be udpated by the chip during read */ | 313 | /* may be updated by the chip during read */ |
| 314 | /******************************************************/ | 314 | /******************************************************/ |
| 315 | static u_char | 315 | static u_char |
| 316 | Read_hfc8_stable(hfc4s8s_hw * hw, int reg) | 316 | Read_hfc8_stable(hfc4s8s_hw * hw, int reg) |
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c index 565d5b2adc95..129cda737880 100644 --- a/drivers/macintosh/windfarm_pm81.c +++ b/drivers/macintosh/windfarm_pm81.c | |||
| @@ -188,7 +188,7 @@ struct wf_smu_sys_fans_state { | |||
| 188 | }; | 188 | }; |
| 189 | 189 | ||
| 190 | /* | 190 | /* |
| 191 | * Configs for SMU Sytem Fan control loop | 191 | * Configs for SMU System Fan control loop |
| 192 | */ | 192 | */ |
| 193 | static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { | 193 | static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { |
| 194 | /* Model ID 2 */ | 194 | /* Model ID 2 */ |
diff --git a/drivers/media/dvb/dvb-usb/friio-fe.c b/drivers/media/dvb/dvb-usb/friio-fe.c index d14bd227b502..93c21ddd0b77 100644 --- a/drivers/media/dvb/dvb-usb/friio-fe.c +++ b/drivers/media/dvb/dvb-usb/friio-fe.c | |||
| @@ -300,7 +300,7 @@ static int jdvbt90502_set_frontend(struct dvb_frontend *fe, | |||
| 300 | struct dvb_frontend_parameters *p) | 300 | struct dvb_frontend_parameters *p) |
| 301 | { | 301 | { |
| 302 | /** | 302 | /** |
| 303 | * NOTE: ignore all the paramters except frequency. | 303 | * NOTE: ignore all the parameters except frequency. |
| 304 | * others should be fixed to the proper value for ISDB-T, | 304 | * others should be fixed to the proper value for ISDB-T, |
| 305 | * but don't check here. | 305 | * but don't check here. |
| 306 | */ | 306 | */ |
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index 11073fa3d9f4..d33693c13368 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c | |||
| @@ -314,22 +314,22 @@ static int i2o_cfg_swul(unsigned long arg) | |||
| 314 | int ret = 0; | 314 | int ret = 0; |
| 315 | 315 | ||
| 316 | if (copy_from_user(&kxfer, pxfer, sizeof(struct i2o_sw_xfer))) | 316 | if (copy_from_user(&kxfer, pxfer, sizeof(struct i2o_sw_xfer))) |
| 317 | goto return_fault; | 317 | return -EFAULT; |
| 318 | 318 | ||
| 319 | if (get_user(swlen, kxfer.swlen) < 0) | 319 | if (get_user(swlen, kxfer.swlen) < 0) |
| 320 | goto return_fault; | 320 | return -EFAULT; |
| 321 | 321 | ||
| 322 | if (get_user(maxfrag, kxfer.maxfrag) < 0) | 322 | if (get_user(maxfrag, kxfer.maxfrag) < 0) |
| 323 | goto return_fault; | 323 | return -EFAULT; |
| 324 | 324 | ||
| 325 | if (get_user(curfrag, kxfer.curfrag) < 0) | 325 | if (get_user(curfrag, kxfer.curfrag) < 0) |
| 326 | goto return_fault; | 326 | return -EFAULT; |
| 327 | 327 | ||
| 328 | if (curfrag == maxfrag) | 328 | if (curfrag == maxfrag) |
| 329 | fragsize = swlen - (maxfrag - 1) * 8192; | 329 | fragsize = swlen - (maxfrag - 1) * 8192; |
| 330 | 330 | ||
| 331 | if (!kxfer.buf) | 331 | if (!kxfer.buf) |
| 332 | goto return_fault; | 332 | return -EFAULT; |
| 333 | 333 | ||
| 334 | c = i2o_find_iop(kxfer.iop); | 334 | c = i2o_find_iop(kxfer.iop); |
| 335 | if (!c) | 335 | if (!c) |
| @@ -373,12 +373,8 @@ static int i2o_cfg_swul(unsigned long arg) | |||
| 373 | 373 | ||
| 374 | i2o_dma_free(&c->pdev->dev, &buffer); | 374 | i2o_dma_free(&c->pdev->dev, &buffer); |
| 375 | 375 | ||
| 376 | return_ret: | ||
| 377 | return ret; | 376 | return ret; |
| 378 | return_fault: | 377 | } |
| 379 | ret = -EFAULT; | ||
| 380 | goto return_ret; | ||
| 381 | }; | ||
| 382 | 378 | ||
| 383 | static int i2o_cfg_swdel(unsigned long arg) | 379 | static int i2o_cfg_swdel(unsigned long arg) |
| 384 | { | 380 | { |
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c index f939ebc2507c..e306a8cd2f96 100644 --- a/drivers/misc/eeprom/eeprom.c +++ b/drivers/misc/eeprom/eeprom.c | |||
| @@ -1,24 +1,20 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and | 2 | * Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and |
| 3 | Philip Edelbrock <phil@netroedge.com> | 3 | * Philip Edelbrock <phil@netroedge.com> |
| 4 | Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> | 4 | * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> |
| 5 | Copyright (C) 2003 IBM Corp. | 5 | * Copyright (C) 2003 IBM Corp. |
| 6 | Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> | 6 | * Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> |
| 7 | 7 | * | |
| 8 | This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
| 9 | it under the terms of the GNU General Public License as published by | 9 | * it under the terms of the GNU General Public License as published by |
| 10 | the Free Software Foundation; either version 2 of the License, or | 10 | * the Free Software Foundation; either version 2 of the License, or |
| 11 | (at your option) any later version. | 11 | * (at your option) any later version. |
| 12 | 12 | * | |
| 13 | This program is distributed in the hope that it will be useful, | 13 | * This program is distributed in the hope that it will be useful, |
| 14 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 16 | GNU General Public License for more details. | 16 | * GNU General Public License for more details. |
| 17 | 17 | */ | |
| 18 | You should have received a copy of the GNU General Public License | ||
| 19 | along with this program; if not, write to the Free Software | ||
| 20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 21 | */ | ||
| 22 | 18 | ||
| 23 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 24 | #include <linux/init.h> | 20 | #include <linux/init.h> |
diff --git a/drivers/misc/eeprom/eeprom_93cx6.c b/drivers/misc/eeprom/eeprom_93cx6.c index 15b1780025c8..7b33de95c4bf 100644 --- a/drivers/misc/eeprom/eeprom_93cx6.c +++ b/drivers/misc/eeprom/eeprom_93cx6.c | |||
| @@ -1,27 +1,20 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright (C) 2004 - 2006 rt2x00 SourceForge Project | 2 | * Copyright (C) 2004 - 2006 rt2x00 SourceForge Project |
| 3 | <http://rt2x00.serialmonkey.com> | 3 | * <http://rt2x00.serialmonkey.com> |
| 4 | 4 | * | |
| 5 | This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
| 6 | it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
| 7 | the Free Software Foundation; either version 2 of the License, or | 7 | * the Free Software Foundation; either version 2 of the License, or |
| 8 | (at your option) any later version. | 8 | * (at your option) any later version. |
| 9 | 9 | * | |
| 10 | This program is distributed in the hope that it will be useful, | 10 | * This program is distributed in the hope that it will be useful, |
| 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 13 | GNU General Public License for more details. | 13 | * GNU General Public License for more details. |
| 14 | 14 | * | |
| 15 | You should have received a copy of the GNU General Public License | 15 | * Module: eeprom_93cx6 |
| 16 | along with this program; if not, write to the | 16 | * Abstract: EEPROM reader routines for 93cx6 chipsets. |
| 17 | Free Software Foundation, Inc., | 17 | * Supported chipsets: 93c46 & 93c66. |
| 18 | 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| 19 | */ | ||
| 20 | |||
| 21 | /* | ||
| 22 | Module: eeprom_93cx6 | ||
| 23 | Abstract: EEPROM reader routines for 93cx6 chipsets. | ||
| 24 | Supported chipsets: 93c46 & 93c66. | ||
| 25 | */ | 18 | */ |
| 26 | 19 | ||
| 27 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c index 5a6b2bce8ad5..fe2909278507 100644 --- a/drivers/misc/eeprom/max6875.c +++ b/drivers/misc/eeprom/max6875.c | |||
| @@ -1,30 +1,30 @@ | |||
| 1 | /* | 1 | /* |
| 2 | max6875.c - driver for MAX6874/MAX6875 | 2 | * max6875.c - driver for MAX6874/MAX6875 |
| 3 | 3 | * | |
| 4 | Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com> | 4 | * Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com> |
| 5 | 5 | * | |
| 6 | Based on eeprom.c | 6 | * Based on eeprom.c |
| 7 | 7 | * | |
| 8 | The MAX6875 has a bank of registers and two banks of EEPROM. | 8 | * The MAX6875 has a bank of registers and two banks of EEPROM. |
| 9 | Address ranges are defined as follows: | 9 | * Address ranges are defined as follows: |
| 10 | * 0x0000 - 0x0046 = configuration registers | 10 | * * 0x0000 - 0x0046 = configuration registers |
| 11 | * 0x8000 - 0x8046 = configuration EEPROM | 11 | * * 0x8000 - 0x8046 = configuration EEPROM |
| 12 | * 0x8100 - 0x82FF = user EEPROM | 12 | * * 0x8100 - 0x82FF = user EEPROM |
| 13 | 13 | * | |
| 14 | This driver makes the user EEPROM available for read. | 14 | * This driver makes the user EEPROM available for read. |
| 15 | 15 | * | |
| 16 | The registers & config EEPROM should be accessed via i2c-dev. | 16 | * The registers & config EEPROM should be accessed via i2c-dev. |
| 17 | 17 | * | |
| 18 | The MAX6875 ignores the lowest address bit, so each chip responds to | 18 | * The MAX6875 ignores the lowest address bit, so each chip responds to |
| 19 | two addresses - 0x50/0x51 and 0x52/0x53. | 19 | * two addresses - 0x50/0x51 and 0x52/0x53. |
| 20 | 20 | * | |
| 21 | Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read | 21 | * Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read |
| 22 | address, so this driver is destructive if loaded for the wrong EEPROM chip. | 22 | * address, so this driver is destructive if loaded for the wrong EEPROM chip. |
| 23 | 23 | * | |
| 24 | This program is free software; you can redistribute it and/or modify | 24 | * This program is free software; you can redistribute it and/or modify |
| 25 | it under the terms of the GNU General Public License as published by | 25 | * it under the terms of the GNU General Public License as published by |
| 26 | the Free Software Foundation; version 2 of the License. | 26 | * the Free Software Foundation; version 2 of the License. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h index 760069345b11..fd1f29e0317d 100644 --- a/drivers/net/bnx2x_hsi.h +++ b/drivers/net/bnx2x_hsi.h | |||
| @@ -683,7 +683,7 @@ struct drv_func_mb { | |||
| 683 | #define DRV_MSG_CODE_GET_MANUF_KEY 0x82000000 | 683 | #define DRV_MSG_CODE_GET_MANUF_KEY 0x82000000 |
| 684 | #define DRV_MSG_CODE_LOAD_L2B_PRAM 0x90000000 | 684 | #define DRV_MSG_CODE_LOAD_L2B_PRAM 0x90000000 |
| 685 | /* | 685 | /* |
| 686 | * The optic module verification commands requris bootcode | 686 | * The optic module verification commands require bootcode |
| 687 | * v5.0.6 or later | 687 | * v5.0.6 or later |
| 688 | */ | 688 | */ |
| 689 | #define DRV_MSG_CODE_VRFY_OPT_MDL 0xa0000000 | 689 | #define DRV_MSG_CODE_VRFY_OPT_MDL 0xa0000000 |
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index f0be507e5324..369a8016b1ff 100644 --- a/drivers/net/ps3_gelic_wireless.c +++ b/drivers/net/ps3_gelic_wireless.c | |||
| @@ -96,7 +96,7 @@ static inline int precise_ie(void) | |||
| 96 | * post_eurus_cmd helpers | 96 | * post_eurus_cmd helpers |
| 97 | */ | 97 | */ |
| 98 | struct eurus_cmd_arg_info { | 98 | struct eurus_cmd_arg_info { |
| 99 | int pre_arg; /* command requres arg1, arg2 at POST COMMAND */ | 99 | int pre_arg; /* command requires arg1, arg2 at POST COMMAND */ |
| 100 | int post_arg; /* command requires arg1, arg2 at GET_RESULT */ | 100 | int post_arg; /* command requires arg1, arg2 at GET_RESULT */ |
| 101 | }; | 101 | }; |
| 102 | 102 | ||
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index cbf520d38eac..ffbaa608e002 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
| @@ -736,7 +736,7 @@ static void smsc911x_phy_adjust_link(struct net_device *dev) | |||
| 736 | SMSC_TRACE(HW, "configuring for carrier OK"); | 736 | SMSC_TRACE(HW, "configuring for carrier OK"); |
| 737 | if ((pdata->gpio_orig_setting & GPIO_CFG_LED1_EN_) && | 737 | if ((pdata->gpio_orig_setting & GPIO_CFG_LED1_EN_) && |
| 738 | (!pdata->using_extphy)) { | 738 | (!pdata->using_extphy)) { |
| 739 | /* Restore orginal GPIO configuration */ | 739 | /* Restore original GPIO configuration */ |
| 740 | pdata->gpio_setting = pdata->gpio_orig_setting; | 740 | pdata->gpio_setting = pdata->gpio_orig_setting; |
| 741 | smsc911x_reg_write(pdata, GPIO_CFG, | 741 | smsc911x_reg_write(pdata, GPIO_CFG, |
| 742 | pdata->gpio_setting); | 742 | pdata->gpio_setting); |
| @@ -750,7 +750,7 @@ static void smsc911x_phy_adjust_link(struct net_device *dev) | |||
| 750 | if ((pdata->gpio_setting & GPIO_CFG_LED1_EN_) && | 750 | if ((pdata->gpio_setting & GPIO_CFG_LED1_EN_) && |
| 751 | (!pdata->using_extphy)) { | 751 | (!pdata->using_extphy)) { |
| 752 | /* Force 10/100 LED off, after saving | 752 | /* Force 10/100 LED off, after saving |
| 753 | * orginal GPIO configuration */ | 753 | * original GPIO configuration */ |
| 754 | pdata->gpio_orig_setting = pdata->gpio_setting; | 754 | pdata->gpio_orig_setting = pdata->gpio_setting; |
| 755 | 755 | ||
| 756 | pdata->gpio_setting &= ~GPIO_CFG_LED1_EN_; | 756 | pdata->gpio_setting &= ~GPIO_CFG_LED1_EN_; |
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c index f184d1d2ecbe..6644337d63d6 100644 --- a/drivers/pci/hotplug/cpqphp_core.c +++ b/drivers/pci/hotplug/cpqphp_core.c | |||
| @@ -848,7 +848,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 848 | goto err_disable_device; | 848 | goto err_disable_device; |
| 849 | } | 849 | } |
| 850 | 850 | ||
| 851 | /* Check for the proper subsytem ID's | 851 | /* Check for the proper subsystem ID's |
| 852 | * Intel uses a different SSID programming model than Compaq. | 852 | * Intel uses a different SSID programming model than Compaq. |
| 853 | * For Intel, each SSID bit identifies a PHP capability. | 853 | * For Intel, each SSID bit identifies a PHP capability. |
| 854 | * Also Intel HPC's may have RID=0. | 854 | * Also Intel HPC's may have RID=0. |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 37499127c801..1df7c508814e 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -1503,7 +1503,7 @@ int pci_prepare_to_sleep(struct pci_dev *dev) | |||
| 1503 | * pci_back_from_sleep - turn PCI device on during system-wide transition into working state | 1503 | * pci_back_from_sleep - turn PCI device on during system-wide transition into working state |
| 1504 | * @dev: Device to handle. | 1504 | * @dev: Device to handle. |
| 1505 | * | 1505 | * |
| 1506 | * Disable device's sytem wake-up capability and put it into D0. | 1506 | * Disable device's system wake-up capability and put it into D0. |
| 1507 | */ | 1507 | */ |
| 1508 | int pci_back_from_sleep(struct pci_dev *dev) | 1508 | int pci_back_from_sleep(struct pci_dev *dev) |
| 1509 | { | 1509 | { |
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 4eb10f48d270..f8077b3c8c8c 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -244,7 +244,7 @@ struct pci_ats { | |||
| 244 | int stu; /* Smallest Translation Unit */ | 244 | int stu; /* Smallest Translation Unit */ |
| 245 | int qdep; /* Invalidate Queue Depth */ | 245 | int qdep; /* Invalidate Queue Depth */ |
| 246 | int ref_cnt; /* Physical Function reference count */ | 246 | int ref_cnt; /* Physical Function reference count */ |
| 247 | int is_enabled:1; /* Enable bit is set */ | 247 | unsigned int is_enabled:1; /* Enable bit is set */ |
| 248 | }; | 248 | }; |
| 249 | 249 | ||
| 250 | #ifdef CONFIG_PCI_IOV | 250 | #ifdef CONFIG_PCI_IOV |
diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c index 3cbaf1811bd0..d37c445f0eda 100644 --- a/drivers/ps3/ps3-sys-manager.c +++ b/drivers/ps3/ps3-sys-manager.c | |||
| @@ -119,7 +119,7 @@ enum ps3_sys_manager_service_id { | |||
| 119 | * enum ps3_sys_manager_attr - Notification attribute (bit position mask). | 119 | * enum ps3_sys_manager_attr - Notification attribute (bit position mask). |
| 120 | * @PS3_SM_ATTR_POWER: Power button. | 120 | * @PS3_SM_ATTR_POWER: Power button. |
| 121 | * @PS3_SM_ATTR_RESET: Reset button, not available on retail console. | 121 | * @PS3_SM_ATTR_RESET: Reset button, not available on retail console. |
| 122 | * @PS3_SM_ATTR_THERMAL: Sytem thermal alert. | 122 | * @PS3_SM_ATTR_THERMAL: System thermal alert. |
| 123 | * @PS3_SM_ATTR_CONTROLLER: Remote controller event. | 123 | * @PS3_SM_ATTR_CONTROLLER: Remote controller event. |
| 124 | * @PS3_SM_ATTR_ALL: Logical OR of all. | 124 | * @PS3_SM_ATTR_ALL: Logical OR of all. |
| 125 | * | 125 | * |
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 2b4e40d31190..51cf2bb37438 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
| @@ -1540,7 +1540,7 @@ EXPORT_SYMBOL_GPL(regulator_count_voltages); | |||
| 1540 | * Context: can sleep | 1540 | * Context: can sleep |
| 1541 | * | 1541 | * |
| 1542 | * Returns a voltage that can be passed to @regulator_set_voltage(), | 1542 | * Returns a voltage that can be passed to @regulator_set_voltage(), |
| 1543 | * zero if this selector code can't be used on this sytem, or a | 1543 | * zero if this selector code can't be used on this system, or a |
| 1544 | * negative errno. | 1544 | * negative errno. |
| 1545 | */ | 1545 | */ |
| 1546 | int regulator_list_voltage(struct regulator *regulator, unsigned selector) | 1546 | int regulator_list_voltage(struct regulator *regulator, unsigned selector) |
diff --git a/drivers/rtc/rtc-rx8581.c b/drivers/rtc/rtc-rx8581.c index c9522f3bc21c..9718aaaa8215 100644 --- a/drivers/rtc/rtc-rx8581.c +++ b/drivers/rtc/rtc-rx8581.c | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * An I2C driver for the Epson RX8581 RTC | 2 | * An I2C driver for the Epson RX8581 RTC |
| 3 | * | 3 | * |
| 4 | * Author: Martyn Welch <martyn.welch@gefanuc.com> | 4 | * Author: Martyn Welch <martyn.welch@ge.com> |
| 5 | * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 5 | * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc. |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| 8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
| @@ -272,7 +272,7 @@ static void __exit rx8581_exit(void) | |||
| 272 | i2c_del_driver(&rx8581_driver); | 272 | i2c_del_driver(&rx8581_driver); |
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | MODULE_AUTHOR("Martyn Welch <martyn.welch@gefanuc.com>"); | 275 | MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>"); |
| 276 | MODULE_DESCRIPTION("Epson RX-8581 RTC driver"); | 276 | MODULE_DESCRIPTION("Epson RX-8581 RTC driver"); |
| 277 | MODULE_LICENSE("GPL"); | 277 | MODULE_LICENSE("GPL"); |
| 278 | MODULE_VERSION(DRV_VERSION); | 278 | MODULE_VERSION(DRV_VERSION); |
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index 875ba099e7a5..b53a00198dbe 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * A RTC driver for the Simtek STK17TA8 | 2 | * A RTC driver for the Simtek STK17TA8 |
| 3 | * | 3 | * |
| 4 | * By Thomas Hommel <thomas.hommel@gefanuc.com> | 4 | * By Thomas Hommel <thomas.hommel@ge.com> |
| 5 | * | 5 | * |
| 6 | * Based on the DS1553 driver from | 6 | * Based on the DS1553 driver from |
| 7 | * Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 7 | * Atsushi Nemoto <anemo@mba.ocn.ne.jp> |
| @@ -382,7 +382,7 @@ static __exit void stk17ta8_exit(void) | |||
| 382 | module_init(stk17ta8_init); | 382 | module_init(stk17ta8_init); |
| 383 | module_exit(stk17ta8_exit); | 383 | module_exit(stk17ta8_exit); |
| 384 | 384 | ||
| 385 | MODULE_AUTHOR("Thomas Hommel <thomas.hommel@gefanuc.com>"); | 385 | MODULE_AUTHOR("Thomas Hommel <thomas.hommel@ge.com>"); |
| 386 | MODULE_DESCRIPTION("Simtek STK17TA8 RTC driver"); | 386 | MODULE_DESCRIPTION("Simtek STK17TA8 RTC driver"); |
| 387 | MODULE_LICENSE("GPL"); | 387 | MODULE_LICENSE("GPL"); |
| 388 | MODULE_VERSION(DRV_VERSION); | 388 | MODULE_VERSION(DRV_VERSION); |
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c index 62c2647f37f4..4a51e3f09689 100644 --- a/drivers/s390/char/sclp_cpi_sys.c +++ b/drivers/s390/char/sclp_cpi_sys.c | |||
| @@ -102,7 +102,7 @@ static struct sclp_req *cpi_prepare_req(void) | |||
| 102 | /* set system name */ | 102 | /* set system name */ |
| 103 | set_data(evb->system_name, system_name); | 103 | set_data(evb->system_name, system_name); |
| 104 | 104 | ||
| 105 | /* set sytem level */ | 105 | /* set system level */ |
| 106 | evb->system_level = system_level; | 106 | evb->system_level = system_level; |
| 107 | 107 | ||
| 108 | /* set sysplex name */ | 108 | /* set sysplex name */ |
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_cee.h b/drivers/scsi/bfa/include/defs/bfa_defs_cee.h index b0ac9ac15c5d..6eaf519eccdc 100644 --- a/drivers/scsi/bfa/include/defs/bfa_defs_cee.h +++ b/drivers/scsi/bfa/include/defs/bfa_defs_cee.h | |||
| @@ -50,7 +50,7 @@ struct bfa_cee_lldp_str_s { | |||
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | 52 | ||
| 53 | /* LLDP paramters */ | 53 | /* LLDP parameters */ |
| 54 | struct bfa_cee_lldp_cfg_s { | 54 | struct bfa_cee_lldp_cfg_s { |
| 55 | struct bfa_cee_lldp_str_s chassis_id; | 55 | struct bfa_cee_lldp_str_s chassis_id; |
| 56 | struct bfa_cee_lldp_str_s port_id; | 56 | struct bfa_cee_lldp_str_s port_id; |
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_status.h b/drivers/scsi/bfa/include/defs/bfa_defs_status.h index 4374494bd566..ec78b4cb121a 100644 --- a/drivers/scsi/bfa/include/defs/bfa_defs_status.h +++ b/drivers/scsi/bfa/include/defs/bfa_defs_status.h | |||
| @@ -223,9 +223,9 @@ enum bfa_status { | |||
| 223 | BFA_STATUS_IM_PVID_NON_ZERO = 140, /* Port VLAN ID (PVID) is Set to | 223 | BFA_STATUS_IM_PVID_NON_ZERO = 140, /* Port VLAN ID (PVID) is Set to |
| 224 | * Non-Zero Value */ | 224 | * Non-Zero Value */ |
| 225 | BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /* Acquiring Network | 225 | BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /* Acquiring Network |
| 226 | * Subsytem Lock Failed.Please | 226 | * Subsystem Lock Failed.Please |
| 227 | * try after some time */ | 227 | * try after some time */ |
| 228 | BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /* Acquiring Network Subsytem | 228 | BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /* Acquiring Network Subsystem |
| 229 | * handle Failed. Please try | 229 | * handle Failed. Please try |
| 230 | * after some time */ | 230 | * after some time */ |
| 231 | BFA_STATUS_IM_NOT_BOUND = 143, /* IM driver is not active */ | 231 | BFA_STATUS_IM_NOT_BOUND = 143, /* IM driver is not active */ |
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c index 14d052316502..e324627d97a2 100644 --- a/drivers/spi/spi_mpc8xxx.c +++ b/drivers/spi/spi_mpc8xxx.c | |||
| @@ -640,7 +640,7 @@ static int mpc8xxx_spi_setup(struct spi_device *spi) | |||
| 640 | } | 640 | } |
| 641 | mpc8xxx_spi = spi_master_get_devdata(spi->master); | 641 | mpc8xxx_spi = spi_master_get_devdata(spi->master); |
| 642 | 642 | ||
| 643 | hw_mode = cs->hw_mode; /* Save orginal settings */ | 643 | hw_mode = cs->hw_mode; /* Save original settings */ |
| 644 | cs->hw_mode = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode); | 644 | cs->hw_mode = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode); |
| 645 | /* mask out bits we are going to set */ | 645 | /* mask out bits we are going to set */ |
| 646 | cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH | 646 | cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH |
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index ed3070edcac1..4fcc4351e73f 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c | |||
| @@ -25,19 +25,19 @@ | |||
| 25 | * Date: May 20, 2003 | 25 | * Date: May 20, 2003 |
| 26 | * | 26 | * |
| 27 | * Functions: | 27 | * Functions: |
| 28 | * s_vGenerateTxParameter - Generate tx dma requried parameter. | 28 | * s_vGenerateTxParameter - Generate tx dma required parameter. |
| 29 | * vGenerateMACHeader - Translate 802.3 to 802.11 header | 29 | * vGenerateMACHeader - Translate 802.3 to 802.11 header |
| 30 | * cbGetFragCount - Caculate fragement number count | 30 | * cbGetFragCount - Caculate fragment number count |
| 31 | * csBeacon_xmit - beacon tx function | 31 | * csBeacon_xmit - beacon tx function |
| 32 | * csMgmt_xmit - management tx function | 32 | * csMgmt_xmit - management tx function |
| 33 | * s_cbFillTxBufHead - fulfill tx dma buffer header | 33 | * s_cbFillTxBufHead - fulfill tx dma buffer header |
| 34 | * s_uGetDataDuration - get tx data required duration | 34 | * s_uGetDataDuration - get tx data required duration |
| 35 | * s_uFillDataHead- fulfill tx data duration header | 35 | * s_uFillDataHead- fulfill tx data duration header |
| 36 | * s_uGetRTSCTSDuration- get rtx/cts requried duration | 36 | * s_uGetRTSCTSDuration- get rtx/cts required duration |
| 37 | * s_uGetRTSCTSRsvTime- get rts/cts reserved time | 37 | * s_uGetRTSCTSRsvTime- get rts/cts reserved time |
| 38 | * s_uGetTxRsvTime- get frame reserved time | 38 | * s_uGetTxRsvTime- get frame reserved time |
| 39 | * s_vFillCTSHead- fulfill CTS ctl header | 39 | * s_vFillCTSHead- fulfill CTS ctl header |
| 40 | * s_vFillFragParameter- Set fragement ctl parameter. | 40 | * s_vFillFragParameter- Set fragment ctl parameter. |
| 41 | * s_vFillRTSHead- fulfill RTS ctl header | 41 | * s_vFillRTSHead- fulfill RTS ctl header |
| 42 | * s_vFillTxKey- fulfill tx encrypt key | 42 | * s_vFillTxKey- fulfill tx encrypt key |
| 43 | * s_vSWencryption- Software encrypt header | 43 | * s_vSWencryption- Software encrypt header |
| @@ -877,7 +877,7 @@ s_vFillRTSHead ( | |||
| 877 | } | 877 | } |
| 878 | 878 | ||
| 879 | // Note: So far RTSHead dosen't appear in ATIM & Beacom DMA, so we don't need to take them into account. | 879 | // Note: So far RTSHead dosen't appear in ATIM & Beacom DMA, so we don't need to take them into account. |
| 880 | // Otherwise, we need to modified codes for them. | 880 | // Otherwise, we need to modify codes for them. |
| 881 | if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { | 881 | if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { |
| 882 | if (byFBOption == AUTO_FB_NONE) { | 882 | if (byFBOption == AUTO_FB_NONE) { |
| 883 | PSRTS_g pBuf = (PSRTS_g)pvRTS; | 883 | PSRTS_g pBuf = (PSRTS_g)pvRTS; |
| @@ -1133,7 +1133,7 @@ s_vFillCTSHead ( | |||
| 1133 | * | 1133 | * |
| 1134 | * Parameters: | 1134 | * Parameters: |
| 1135 | * In: | 1135 | * In: |
| 1136 | * pDevice - Pointer to adpater | 1136 | * pDevice - Pointer to adapter |
| 1137 | * pTxDataHead - Transmit Data Buffer | 1137 | * pTxDataHead - Transmit Data Buffer |
| 1138 | * pTxBufHead - pTxBufHead | 1138 | * pTxBufHead - pTxBufHead |
| 1139 | * pvRrvTime - pvRrvTime | 1139 | * pvRrvTime - pvRrvTime |
| @@ -2252,7 +2252,7 @@ vGenerateFIFOHeader ( | |||
| 2252 | * | 2252 | * |
| 2253 | * Parameters: | 2253 | * Parameters: |
| 2254 | * In: | 2254 | * In: |
| 2255 | * pDevice - Pointer to adpater | 2255 | * pDevice - Pointer to adapter |
| 2256 | * dwTxBufferAddr - Transmit Buffer | 2256 | * dwTxBufferAddr - Transmit Buffer |
| 2257 | * pPacket - Packet from upper layer | 2257 | * pPacket - Packet from upper layer |
| 2258 | * cbPacketSize - Transmit Data Length | 2258 | * cbPacketSize - Transmit Data Length |
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index d9fa36c95230..a2ce6fad8ee5 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c | |||
| @@ -25,17 +25,17 @@ | |||
| 25 | * Date: May 20, 2003 | 25 | * Date: May 20, 2003 |
| 26 | * | 26 | * |
| 27 | * Functions: | 27 | * Functions: |
| 28 | * s_vGenerateTxParameter - Generate tx dma requried parameter. | 28 | * s_vGenerateTxParameter - Generate tx dma required parameter. |
| 29 | * s_vGenerateMACHeader - Translate 802.3 to 802.11 header | 29 | * s_vGenerateMACHeader - Translate 802.3 to 802.11 header |
| 30 | * csBeacon_xmit - beacon tx function | 30 | * csBeacon_xmit - beacon tx function |
| 31 | * csMgmt_xmit - management tx function | 31 | * csMgmt_xmit - management tx function |
| 32 | * s_uGetDataDuration - get tx data required duration | 32 | * s_uGetDataDuration - get tx data required duration |
| 33 | * s_uFillDataHead- fulfill tx data duration header | 33 | * s_uFillDataHead- fulfill tx data duration header |
| 34 | * s_uGetRTSCTSDuration- get rtx/cts requried duration | 34 | * s_uGetRTSCTSDuration- get rtx/cts required duration |
| 35 | * s_uGetRTSCTSRsvTime- get rts/cts reserved time | 35 | * s_uGetRTSCTSRsvTime- get rts/cts reserved time |
| 36 | * s_uGetTxRsvTime- get frame reserved time | 36 | * s_uGetTxRsvTime- get frame reserved time |
| 37 | * s_vFillCTSHead- fulfill CTS ctl header | 37 | * s_vFillCTSHead- fulfill CTS ctl header |
| 38 | * s_vFillFragParameter- Set fragement ctl parameter. | 38 | * s_vFillFragParameter- Set fragment ctl parameter. |
| 39 | * s_vFillRTSHead- fulfill RTS ctl header | 39 | * s_vFillRTSHead- fulfill RTS ctl header |
| 40 | * s_vFillTxKey- fulfill tx encrypt key | 40 | * s_vFillTxKey- fulfill tx encrypt key |
| 41 | * s_vSWencryption- Software encrypt header | 41 | * s_vSWencryption- Software encrypt header |
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 40a858335035..0cd6c7795d90 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c | |||
| @@ -181,7 +181,7 @@ struct ehci_hcd_omap { | |||
| 181 | void __iomem *ehci_base; | 181 | void __iomem *ehci_base; |
| 182 | 182 | ||
| 183 | /* Regulators for USB PHYs. | 183 | /* Regulators for USB PHYs. |
| 184 | * Each PHY can have a seperate regulator. | 184 | * Each PHY can have a separate regulator. |
| 185 | */ | 185 | */ |
| 186 | struct regulator *regulator[OMAP3_HS_USB_PORTS]; | 186 | struct regulator *regulator[OMAP3_HS_USB_PORTS]; |
| 187 | }; | 187 | }; |
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c index 112ef7e26f6b..608d61a105f6 100644 --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c | |||
| @@ -76,7 +76,7 @@ | |||
| 76 | * xfers-per-ripe, blocks-per-rpipe, rpipes-per-host), at the end | 76 | * xfers-per-ripe, blocks-per-rpipe, rpipes-per-host), at the end |
| 77 | * we are going to have to rebuild all this based on an scheduler, | 77 | * we are going to have to rebuild all this based on an scheduler, |
| 78 | * to where we have a list of transactions to do and based on the | 78 | * to where we have a list of transactions to do and based on the |
| 79 | * availability of the different requried components (blocks, | 79 | * availability of the different required components (blocks, |
| 80 | * rpipes, segment slots, etc), we go scheduling them. Painful. | 80 | * rpipes, segment slots, etc), we go scheduling them. Painful. |
| 81 | */ | 81 | */ |
| 82 | #include <linux/init.h> | 82 | #include <linux/init.h> |
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c index 5eb61b5adfe8..42fe155aba0e 100644 --- a/drivers/video/cobalt_lcdfb.c +++ b/drivers/video/cobalt_lcdfb.c | |||
| @@ -123,7 +123,7 @@ static void lcd_clear(struct fb_info *info) | |||
| 123 | lcd_write_control(info, LCD_RESET); | 123 | lcd_write_control(info, LCD_RESET); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | static struct fb_fix_screeninfo cobalt_lcdfb_fix __initdata = { | 126 | static struct fb_fix_screeninfo cobalt_lcdfb_fix __devinitdata = { |
| 127 | .id = "cobalt-lcd", | 127 | .id = "cobalt-lcd", |
| 128 | .type = FB_TYPE_TEXT, | 128 | .type = FB_TYPE_TEXT, |
| 129 | .type_aux = FB_AUX_TEXT_MDA, | 129 | .type_aux = FB_AUX_TEXT_MDA, |
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 24747aef1952..95896f387927 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c | |||
| @@ -655,7 +655,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev, | |||
| 655 | /* we use the subsystem vendor/device id as the virtio vendor/device | 655 | /* we use the subsystem vendor/device id as the virtio vendor/device |
| 656 | * id. this allows us to use the same PCI vendor/device id for all | 656 | * id. this allows us to use the same PCI vendor/device id for all |
| 657 | * virtio devices and to identify the particular virtio driver by | 657 | * virtio devices and to identify the particular virtio driver by |
| 658 | * the subsytem ids */ | 658 | * the subsystem ids */ |
| 659 | vp_dev->vdev.id.vendor = pci_dev->subsystem_vendor; | 659 | vp_dev->vdev.id.vendor = pci_dev->subsystem_vendor; |
| 660 | vp_dev->vdev.id.device = pci_dev->subsystem_device; | 660 | vp_dev->vdev.id.device = pci_dev->subsystem_device; |
| 661 | 661 | ||
diff --git a/drivers/vlynq/Kconfig b/drivers/vlynq/Kconfig index a9efb1625321..d874b4f34136 100644 --- a/drivers/vlynq/Kconfig +++ b/drivers/vlynq/Kconfig | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | menu "TI VLYNQ" | 1 | menu "TI VLYNQ" |
| 2 | depends on AR7 && EXPERIMENTAL | ||
| 2 | 3 | ||
| 3 | config VLYNQ | 4 | config VLYNQ |
| 4 | bool "TI VLYNQ bus support" | 5 | bool "TI VLYNQ bus support" |
| 5 | depends on AR7 && EXPERIMENTAL | ||
| 6 | help | 6 | help |
| 7 | Support for Texas Instruments(R) VLYNQ bus. | 7 | Support for Texas Instruments(R) VLYNQ bus. |
| 8 | The VLYNQ bus is a high-speed, serial and packetized | 8 | The VLYNQ bus is a high-speed, serial and packetized |
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index c03d4dce4d76..bc2ff5932769 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c | |||
| @@ -1889,7 +1889,7 @@ static struct kmem_cache *get_slab(size_t size) | |||
| 1889 | BUG_ON(i >= JBD2_MAX_SLABS); | 1889 | BUG_ON(i >= JBD2_MAX_SLABS); |
| 1890 | if (unlikely(i < 0)) | 1890 | if (unlikely(i < 0)) |
| 1891 | i = 0; | 1891 | i = 0; |
| 1892 | BUG_ON(jbd2_slab[i] == 0); | 1892 | BUG_ON(jbd2_slab[i] == NULL); |
| 1893 | return jbd2_slab[i]; | 1893 | return jbd2_slab[i]; |
| 1894 | } | 1894 | } |
| 1895 | 1895 | ||
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index 9e2f6a721668..c92ea3b3ea5e 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c | |||
| @@ -2438,7 +2438,7 @@ dbAdjCtl(struct bmap * bmp, s64 blkno, int newval, int alloc, int level) | |||
| 2438 | 2438 | ||
| 2439 | /* check if this is a control page update for an allocation. | 2439 | /* check if this is a control page update for an allocation. |
| 2440 | * if so, update the leaf to reflect the new leaf value using | 2440 | * if so, update the leaf to reflect the new leaf value using |
| 2441 | * dbSplit(); otherwise (deallocation), use dbJoin() to udpate | 2441 | * dbSplit(); otherwise (deallocation), use dbJoin() to update |
| 2442 | * the leaf with the new value. in addition to updating the | 2442 | * the leaf with the new value. in addition to updating the |
| 2443 | * leaf, dbSplit() will also split the binary buddy system of | 2443 | * leaf, dbSplit() will also split the binary buddy system of |
| 2444 | * the leaves, if required, and bubble new values within the | 2444 | * the leaves, if required, and bubble new values within the |
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c index 2396a85c0f55..72d1893ddd36 100644 --- a/fs/logfs/dir.c +++ b/fs/logfs/dir.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | * Atomic dir operations | 12 | * Atomic dir operations |
| 13 | * | 13 | * |
| 14 | * Directory operations are by default not atomic. Dentries and Inodes are | 14 | * Directory operations are by default not atomic. Dentries and Inodes are |
| 15 | * created/removed/altered in seperate operations. Therefore we need to do | 15 | * created/removed/altered in separate operations. Therefore we need to do |
| 16 | * a small amount of journaling. | 16 | * a small amount of journaling. |
| 17 | * | 17 | * |
| 18 | * Create, link, mkdir, mknod and symlink all share the same function to do | 18 | * Create, link, mkdir, mknod and symlink all share the same function to do |
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index 93b55f337245..1a9db84f8d8f 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h | |||
| @@ -707,7 +707,7 @@ static inline gc_level_t expand_level(u64 ino, level_t __level) | |||
| 707 | u8 level = (__force u8)__level; | 707 | u8 level = (__force u8)__level; |
| 708 | 708 | ||
| 709 | if (ino == LOGFS_INO_MASTER) { | 709 | if (ino == LOGFS_INO_MASTER) { |
| 710 | /* ifile has seperate areas */ | 710 | /* ifile has separate areas */ |
| 711 | level += LOGFS_MAX_LEVELS; | 711 | level += LOGFS_MAX_LEVELS; |
| 712 | } | 712 | } |
| 713 | return (__force gc_level_t)level; | 713 | return (__force gc_level_t)level; |
diff --git a/fs/logfs/logfs_abi.h b/fs/logfs/logfs_abi.h index f674725663fe..ae960519c54a 100644 --- a/fs/logfs/logfs_abi.h +++ b/fs/logfs/logfs_abi.h | |||
| @@ -50,9 +50,9 @@ static inline void check_##type(void) \ | |||
| 50 | * 12 - gc recycled blocks, long-lived data | 50 | * 12 - gc recycled blocks, long-lived data |
| 51 | * 13 - replacement blocks, short-lived data | 51 | * 13 - replacement blocks, short-lived data |
| 52 | * | 52 | * |
| 53 | * Levels 1-11 are necessary for robust gc operations and help seperate | 53 | * Levels 1-11 are necessary for robust gc operations and help separate |
| 54 | * short-lived metadata from longer-lived file data. In the future, | 54 | * short-lived metadata from longer-lived file data. In the future, |
| 55 | * file data should get seperated into several segments based on simple | 55 | * file data should get separated into several segments based on simple |
| 56 | * heuristics. Old data recycled during gc operation is expected to be | 56 | * heuristics. Old data recycled during gc operation is expected to be |
| 57 | * long-lived. New data is of uncertain life expectancy. New data | 57 | * long-lived. New data is of uncertain life expectancy. New data |
| 58 | * used to replace older blocks in existing files is expected to be | 58 | * used to replace older blocks in existing files is expected to be |
| @@ -117,7 +117,7 @@ static inline void check_##type(void) \ | |||
| 117 | #define pure_ofs(ofs) (ofs & ~LOGFS_FULLY_POPULATED) | 117 | #define pure_ofs(ofs) (ofs & ~LOGFS_FULLY_POPULATED) |
| 118 | 118 | ||
| 119 | /* | 119 | /* |
| 120 | * LogFS needs to seperate data into levels. Each level is defined as the | 120 | * LogFS needs to separate data into levels. Each level is defined as the |
| 121 | * maximal possible distance from the master inode (inode of the inode file). | 121 | * maximal possible distance from the master inode (inode of the inode file). |
| 122 | * Data blocks reside on level 0, 1x indirect block on level 1, etc. | 122 | * Data blocks reside on level 0, 1x indirect block on level 1, etc. |
| 123 | * Inodes reside on level 6, indirect blocks for the inode file on levels 7-11. | 123 | * Inodes reside on level 6, indirect blocks for the inode file on levels 7-11. |
| @@ -204,7 +204,7 @@ SIZE_CHECK(logfs_segment_header, LOGFS_SEGMENT_HEADERSIZE); | |||
| 204 | * @ds_crc: crc32 of structure starting with the next field | 204 | * @ds_crc: crc32 of structure starting with the next field |
| 205 | * @ds_ifile_levels: maximum number of levels for ifile | 205 | * @ds_ifile_levels: maximum number of levels for ifile |
| 206 | * @ds_iblock_levels: maximum number of levels for regular files | 206 | * @ds_iblock_levels: maximum number of levels for regular files |
| 207 | * @ds_data_levels: number of seperate levels for data | 207 | * @ds_data_levels: number of separate levels for data |
| 208 | * @pad0: reserved, must be 0 | 208 | * @pad0: reserved, must be 0 |
| 209 | * @ds_feature_incompat: incompatible filesystem features | 209 | * @ds_feature_incompat: incompatible filesystem features |
| 210 | * @ds_feature_ro_compat: read-only compatible filesystem features | 210 | * @ds_feature_ro_compat: read-only compatible filesystem features |
| @@ -456,7 +456,7 @@ enum logfs_vim { | |||
| 456 | * @vim: life expectancy of data | 456 | * @vim: life expectancy of data |
| 457 | * | 457 | * |
| 458 | * "Areas" are segments currently being used for writing. There is at least | 458 | * "Areas" are segments currently being used for writing. There is at least |
| 459 | * one area per GC level. Several may be used to seperate long-living from | 459 | * one area per GC level. Several may be used to separate long-living from |
| 460 | * short-living data. If an area with unknown vim is encountered, it can | 460 | * short-living data. If an area with unknown vim is encountered, it can |
| 461 | * simply be closed. | 461 | * simply be closed. |
| 462 | * The write buffer immediately follow this header. | 462 | * The write buffer immediately follow this header. |
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c index c82af6acc2e7..b44bb835e8ea 100644 --- a/fs/omfs/inode.c +++ b/fs/omfs/inode.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | * Copyright (C) 2006 Bob Copeland <me@bobcopeland.com> | 3 | * Copyright (C) 2006 Bob Copeland <me@bobcopeland.com> |
| 4 | * Released under GPL v2. | 4 | * Released under GPL v2. |
| 5 | */ | 5 | */ |
| 6 | #include <linux/version.h> | ||
| 7 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 8 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 9 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index fb6784e86d5f..a63b77d89d30 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
| @@ -496,7 +496,7 @@ struct twl4030_madc_platform_data { | |||
| 496 | int irq_line; | 496 | int irq_line; |
| 497 | }; | 497 | }; |
| 498 | 498 | ||
| 499 | /* Boards have uniqe mappings of {row, col} --> keycode. | 499 | /* Boards have unique mappings of {row, col} --> keycode. |
| 500 | * Column and row are 8 bits each, but range only from 0..7. | 500 | * Column and row are 8 bits each, but range only from 0..7. |
| 501 | * a PERSISTENT_KEY is "always on" and never reported. | 501 | * a PERSISTENT_KEY is "always on" and never reported. |
| 502 | */ | 502 | */ |
| @@ -664,15 +664,15 @@ static inline int twl4030charger_usb_en(int enable) { return 0; } | |||
| 664 | #define TWL4030_REG_VUSB3V1 19 | 664 | #define TWL4030_REG_VUSB3V1 19 |
| 665 | 665 | ||
| 666 | /* TWL6030 SMPS/LDO's */ | 666 | /* TWL6030 SMPS/LDO's */ |
| 667 | /* EXTERNAL dc-to-dc buck convertor contollable via SR */ | 667 | /* EXTERNAL dc-to-dc buck convertor controllable via SR */ |
| 668 | #define TWL6030_REG_VDD1 30 | 668 | #define TWL6030_REG_VDD1 30 |
| 669 | #define TWL6030_REG_VDD2 31 | 669 | #define TWL6030_REG_VDD2 31 |
| 670 | #define TWL6030_REG_VDD3 32 | 670 | #define TWL6030_REG_VDD3 32 |
| 671 | 671 | ||
| 672 | /* Non SR compliant dc-to-dc buck convertors */ | 672 | /* Non SR compliant dc-to-dc buck convertors */ |
| 673 | #define TWL6030_REG_VMEM 33 | 673 | #define TWL6030_REG_VMEM 33 |
| 674 | #define TWL6030_REG_V2V1 34 | 674 | #define TWL6030_REG_V2V1 34 |
| 675 | #define TWL6030_REG_V1V29 35 | 675 | #define TWL6030_REG_V1V29 35 |
| 676 | #define TWL6030_REG_V1V8 36 | 676 | #define TWL6030_REG_V1V8 36 |
| 677 | 677 | ||
| 678 | /* EXTERNAL LDOs */ | 678 | /* EXTERNAL LDOs */ |
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index e117b1aee69c..9fad0527344f 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h | |||
| @@ -201,7 +201,7 @@ static inline __must_check unsigned int kfifo_avail(struct kfifo *fifo) | |||
| 201 | * @n: the length of the data to be added. | 201 | * @n: the length of the data to be added. |
| 202 | * @lock: pointer to the spinlock to use for locking. | 202 | * @lock: pointer to the spinlock to use for locking. |
| 203 | * | 203 | * |
| 204 | * This function copies at most @len bytes from the @from buffer into | 204 | * This function copies at most @n bytes from the @from buffer into |
| 205 | * the FIFO depending on the free space, and returns the number of | 205 | * the FIFO depending on the free space, and returns the number of |
| 206 | * bytes copied. | 206 | * bytes copied. |
| 207 | */ | 207 | */ |
| @@ -227,7 +227,7 @@ static inline unsigned int kfifo_in_locked(struct kfifo *fifo, | |||
| 227 | * @n: the size of the destination buffer. | 227 | * @n: the size of the destination buffer. |
| 228 | * @lock: pointer to the spinlock to use for locking. | 228 | * @lock: pointer to the spinlock to use for locking. |
| 229 | * | 229 | * |
| 230 | * This function copies at most @len bytes from the FIFO into the | 230 | * This function copies at most @n bytes from the FIFO into the |
| 231 | * @to buffer and returns the number of copied bytes. | 231 | * @to buffer and returns the number of copied bytes. |
| 232 | */ | 232 | */ |
| 233 | static inline __must_check unsigned int kfifo_out_locked(struct kfifo *fifo, | 233 | static inline __must_check unsigned int kfifo_out_locked(struct kfifo *fifo, |
diff --git a/include/linux/kobj_map.h b/include/linux/kobj_map.h index 73717ed9ea79..18ca75ffcc5a 100644 --- a/include/linux/kobj_map.h +++ b/include/linux/kobj_map.h | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | /* | ||
| 2 | * kobj_map.h | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef _KOBJ_MAP_H_ | ||
| 6 | #define _KOBJ_MAP_H_ | ||
| 7 | |||
| 1 | #include <linux/mutex.h> | 8 | #include <linux/mutex.h> |
| 2 | 9 | ||
| 3 | typedef struct kobject *kobj_probe_t(dev_t, int *, void *); | 10 | typedef struct kobject *kobj_probe_t(dev_t, int *, void *); |
| @@ -8,3 +15,5 @@ int kobj_map(struct kobj_map *, dev_t, unsigned long, struct module *, | |||
| 8 | void kobj_unmap(struct kobj_map *, dev_t, unsigned long); | 15 | void kobj_unmap(struct kobj_map *, dev_t, unsigned long); |
| 9 | struct kobject *kobj_lookup(struct kobj_map *, dev_t, int *); | 16 | struct kobject *kobj_lookup(struct kobj_map *, dev_t, int *); |
| 10 | struct kobj_map *kobj_map_init(kobj_probe_t *, struct mutex *); | 17 | struct kobj_map *kobj_map_init(kobj_probe_t *, struct mutex *); |
| 18 | |||
| 19 | #endif /* _KOBJ_MAP_H_ */ | ||
diff --git a/include/linux/kref.h b/include/linux/kref.h index b0cb0ebad9e6..baf4b9e4b194 100644 --- a/include/linux/kref.h +++ b/include/linux/kref.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * kref.c - library routines for handling generic reference counted objects | 2 | * kref.h - library routines for handling generic reference counted objects |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com> | 4 | * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com> |
| 5 | * Copyright (C) 2004 IBM Corp. | 5 | * Copyright (C) 2004 IBM Corp. |
diff --git a/include/linux/rtc-v3020.h b/include/linux/rtc-v3020.h index 8ba646e610d9..e55d82cebf80 100644 --- a/include/linux/rtc-v3020.h +++ b/include/linux/rtc-v3020.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | struct v3020_platform_data { | 15 | struct v3020_platform_data { |
| 16 | int leftshift; /* (1<<(leftshift)) & readl() */ | 16 | int leftshift; /* (1<<(leftshift)) & readl() */ |
| 17 | 17 | ||
| 18 | int use_gpio:1; | 18 | unsigned int use_gpio:1; |
| 19 | unsigned int gpio_cs; | 19 | unsigned int gpio_cs; |
| 20 | unsigned int gpio_wr; | 20 | unsigned int gpio_wr; |
| 21 | unsigned int gpio_rd; | 21 | unsigned int gpio_rd; |
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index e9ec642932ee..291775021b2e 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -3615,7 +3615,7 @@ static void __init cgroup_init_subsys(struct cgroup_subsys *ss) | |||
| 3615 | * @ss: the subsystem to load | 3615 | * @ss: the subsystem to load |
| 3616 | * | 3616 | * |
| 3617 | * This function should be called in a modular subsystem's initcall. If the | 3617 | * This function should be called in a modular subsystem's initcall. If the |
| 3618 | * subsytem is built as a module, it will be assigned a new subsys_id and set | 3618 | * subsystem is built as a module, it will be assigned a new subsys_id and set |
| 3619 | * up for use. If the subsystem is built-in anyway, work is delegated to the | 3619 | * up for use. If the subsystem is built-in anyway, work is delegated to the |
| 3620 | * simpler cgroup_init_subsys. | 3620 | * simpler cgroup_init_subsys. |
| 3621 | */ | 3621 | */ |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8a79a6f0f029..c8569bc298ff 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
| @@ -1438,7 +1438,7 @@ static void drain_local_stock(struct work_struct *dummy) | |||
| 1438 | 1438 | ||
| 1439 | /* | 1439 | /* |
| 1440 | * Cache charges(val) which is from res_counter, to local per_cpu area. | 1440 | * Cache charges(val) which is from res_counter, to local per_cpu area. |
| 1441 | * This will be consumed by consumt_stock() function, later. | 1441 | * This will be consumed by consume_stock() function, later. |
| 1442 | */ | 1442 | */ |
| 1443 | static void refill_stock(struct mem_cgroup *mem, int val) | 1443 | static void refill_stock(struct mem_cgroup *mem, int val) |
| 1444 | { | 1444 | { |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d03c946d5566..a6326c71b663 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -2579,7 +2579,7 @@ static int default_zonelist_order(void) | |||
| 2579 | struct zone *z; | 2579 | struct zone *z; |
| 2580 | int average_size; | 2580 | int average_size; |
| 2581 | /* | 2581 | /* |
| 2582 | * ZONE_DMA and ZONE_DMA32 can be very small area in the sytem. | 2582 | * ZONE_DMA and ZONE_DMA32 can be very small area in the system. |
| 2583 | * If they are really small and used heavily, the system can fall | 2583 | * If they are really small and used heavily, the system can fall |
| 2584 | * into OOM very easily. | 2584 | * into OOM very easily. |
| 2585 | * This function detect ZONE_DMA/DMA32 size and confgigures zone order. | 2585 | * This function detect ZONE_DMA/DMA32 size and confgigures zone order. |
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index ec19a890c9a0..82aa9c9e4edb 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | * overflow. | 22 | * overflow. |
| 23 | * Carlos Picoto : PIMv1 Support | 23 | * Carlos Picoto : PIMv1 Support |
| 24 | * Pavlin Ivanov Radoslavov: PIMv2 Registers must checksum only PIM header | 24 | * Pavlin Ivanov Radoslavov: PIMv2 Registers must checksum only PIM header |
| 25 | * Relax this requrement to work with older peers. | 25 | * Relax this requirement to work with older peers. |
| 26 | * | 26 | * |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
diff --git a/net/wimax/op-rfkill.c b/net/wimax/op-rfkill.c index e978c7136c97..2609e445fe7d 100644 --- a/net/wimax/op-rfkill.c +++ b/net/wimax/op-rfkill.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | * wimax_rfkill() Kernel calling wimax_rfkill() | 43 | * wimax_rfkill() Kernel calling wimax_rfkill() |
| 44 | * __wimax_rf_toggle_radio() | 44 | * __wimax_rf_toggle_radio() |
| 45 | * | 45 | * |
| 46 | * wimax_rfkill_set_radio_block() RF-Kill subsytem calling | 46 | * wimax_rfkill_set_radio_block() RF-Kill subsystem calling |
| 47 | * __wimax_rf_toggle_radio() | 47 | * __wimax_rf_toggle_radio() |
| 48 | * | 48 | * |
| 49 | * __wimax_rf_toggle_radio() | 49 | * __wimax_rf_toggle_radio() |
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index b6b2a46af14c..25d1ec4ca28a 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c | |||
| @@ -72,7 +72,7 @@ int file_write_dep(const char *name) | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | 74 | ||
| 75 | /* Allocate initial growable sting */ | 75 | /* Allocate initial growable string */ |
| 76 | struct gstr str_new(void) | 76 | struct gstr str_new(void) |
| 77 | { | 77 | { |
| 78 | struct gstr gs; | 78 | struct gstr gs; |
diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 47bdd2f99b78..fa27f3dac769 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | # | 2 | # |
| 3 | # Output a simple RPM spec file that uses no fancy features requring | 3 | # Output a simple RPM spec file that uses no fancy features requiring |
| 4 | # RPM v4. This is intended to work with any RPM distro. | 4 | # RPM v4. This is intended to work with any RPM distro. |
| 5 | # | 5 | # |
| 6 | # The only gothic bit here is redefining install_post to avoid | 6 | # The only gothic bit here is redefining install_post to avoid |
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index f18bd6207c50..66c7fb3ced3e 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
| @@ -1787,7 +1787,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card, | |||
| 1787 | else if (subsystem) | 1787 | else if (subsystem) |
| 1788 | snd_printdd("Sound card name = %s, " | 1788 | snd_printdd("Sound card name = %s, " |
| 1789 | "vendor = 0x%x, device = 0x%x, subsystem = 0x%x. " | 1789 | "vendor = 0x%x, device = 0x%x, subsystem = 0x%x. " |
| 1790 | "Forced to subsytem = 0x%x\n", c->name, | 1790 | "Forced to subsystem = 0x%x\n", c->name, |
| 1791 | pci->vendor, pci->device, emu->serial, c->subsystem); | 1791 | pci->vendor, pci->device, emu->serial, c->subsystem); |
| 1792 | else | 1792 | else |
| 1793 | snd_printdd("Sound card name = %s, " | 1793 | snd_printdd("Sound card name = %s, " |
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 7cee364976ff..7a97f126f6f7 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
| @@ -361,7 +361,7 @@ struct hda_bus_unsolicited { | |||
| 361 | }; | 361 | }; |
| 362 | 362 | ||
| 363 | /* | 363 | /* |
| 364 | * Helper for automatic ping configuration | 364 | * Helper for automatic pin configuration |
| 365 | */ | 365 | */ |
| 366 | 366 | ||
| 367 | enum { | 367 | enum { |
