openwrt/staging/blogic.git
17 years agofile link fix for Pegasus USB net driver help
Cal Peake [Sat, 20 Oct 2007 00:19:33 +0000 (02:19 +0200)]
file link fix for Pegasus USB net driver help

Update the file link in the Pegasus USB network driver's help text.

Signed-off-by: Cal Peake <cp@absolutedigital.net>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoremove unused return within void return function
Denis Cheng [Sat, 20 Oct 2007 00:18:21 +0000 (02:18 +0200)]
remove unused return within void return function

Signed-off-by: Denis Cheng <crquan@gmail.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoTypo fixes retrun -> return
Gabriel Craciunescu [Sat, 20 Oct 2007 00:13:26 +0000 (02:13 +0200)]
Typo fixes retrun -> return

Typo fixes retrun -> return

Signed-off-by: Gabriel Craciunescu <nix.or.die@googlemail.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agox86 hpet.h: remove broken links
Dave Young [Sat, 20 Oct 2007 00:04:48 +0000 (02:04 +0200)]
x86 hpet.h: remove broken links

Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoUpdate 2.4 maintainer in document
Li Yang [Sat, 20 Oct 2007 00:02:12 +0000 (02:02 +0200)]
Update 2.4 maintainer in document

Update the maintainer of 2.4 kernel in Documentations/SubmittingPatches.

Signed-off-by: Li Yang <leo@zh-kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agofix comment: unlock_hrtimer_base is the counterpart of lock_hrtimer_base
Uwe Kleine-König [Fri, 19 Oct 2007 23:56:53 +0000 (01:56 +0200)]
fix comment: unlock_hrtimer_base is the counterpart of lock_hrtimer_base

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agofix typo "sort" -> "short"
Uwe Kleine-König [Fri, 19 Oct 2007 23:55:58 +0000 (01:55 +0200)]
fix typo "sort" -> "short"

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agofix typo "insted" -> "instead"
Uwe Kleine-König [Fri, 19 Oct 2007 23:55:04 +0000 (01:55 +0200)]
fix typo "insted" -> "instead"

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation/filesystems/files.txt: remove rcuref_inc_lf() reverences
Eric Dumazet [Fri, 19 Oct 2007 23:47:49 +0000 (01:47 +0200)]
Documentation/filesystems/files.txt: remove rcuref_inc_lf() reverences

rcuref_inc_lf() is not used anymore. Replace it by atomic_inc_not_zero()

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agokernel/sched.c: remove bogus comment from account_user_time
Michael Neuling [Fri, 19 Oct 2007 23:41:05 +0000 (01:41 +0200)]
kernel/sched.c: remove bogus comment from account_user_time

hardirq_offset is no longer needed.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agotypo fixes
Matt LaPlante [Fri, 19 Oct 2007 23:34:40 +0000 (01:34 +0200)]
typo fixes

Most of these fixes were already submitted for old kernel versions, and were
approved, but for some reason they never made it into the releases.

Because this is a consolidation of a couple old missed patches, it touches both
Kconfigs and documentation texts.

Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: Documentation/
Simon Arlott [Fri, 19 Oct 2007 23:30:25 +0000 (01:30 +0200)]
spelling fixes: Documentation/

Spelling fixes in Documentation/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: lib/
Simon Arlott [Fri, 19 Oct 2007 23:29:18 +0000 (01:29 +0200)]
spelling fixes: lib/

Spelling fix in lib/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: init/
Simon Arlott [Fri, 19 Oct 2007 23:28:29 +0000 (01:28 +0200)]
spelling fixes: init/

Spelling fix in init/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: mm/
Simon Arlott [Fri, 19 Oct 2007 23:27:18 +0000 (01:27 +0200)]
spelling fixes: mm/

Spelling fixes in mm/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/x86_64/
Simon Arlott [Fri, 19 Oct 2007 23:25:36 +0000 (01:25 +0200)]
spelling fixes: arch/x86_64/

Spelling fixes in arch/x86_64/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/v850/
Simon Arlott [Fri, 19 Oct 2007 23:24:05 +0000 (01:24 +0200)]
spelling fixes: arch/v850/

Spelling fixes in arch/v850/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/um/
Simon Arlott [Fri, 19 Oct 2007 23:23:03 +0000 (01:23 +0200)]
spelling fixes: arch/um/

Spelling fixes in arch/um/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/m68k/
Simon Arlott [Fri, 19 Oct 2007 23:20:32 +0000 (01:20 +0200)]
spelling fixes: arch/m68k/

Spelling fixes in arch/m68k/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/m32r/
Simon Arlott [Fri, 19 Oct 2007 23:14:39 +0000 (01:14 +0200)]
spelling fixes: arch/m32r/

Spelling fixes in arch/m32r/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/i386/
Simon Arlott [Fri, 19 Oct 2007 23:13:56 +0000 (01:13 +0200)]
spelling fixes: arch/i386/

Spelling fixes in arch/i386/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/h8300/
Simon Arlott [Fri, 19 Oct 2007 23:10:46 +0000 (01:10 +0200)]
spelling fixes: arch/h8300/

Spelling fixes in arch/h8300/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/frv/
Simon Arlott [Fri, 19 Oct 2007 23:09:42 +0000 (01:09 +0200)]
spelling fixes: arch/frv/

Spelling fixes in arch/frv/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Acked-By: David Howells <dhowells@redhat.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/cris/
Simon Arlott [Fri, 19 Oct 2007 23:08:50 +0000 (01:08 +0200)]
spelling fixes: arch/cris/

Spelling fixes in arch/cris/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agospelling fixes: arch/alpha/
Simon Arlott [Fri, 19 Oct 2007 23:04:37 +0000 (01:04 +0200)]
spelling fixes: arch/alpha/

Spelling fixes in arch/alpha/.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agopata_cmd64x.c typo fix
Adrian Bunk [Fri, 19 Oct 2007 23:02:48 +0000 (01:02 +0200)]
pata_cmd64x.c typo fix

Spotted by David Miller <davem@davemloft.net>.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoremove duplicate MMAPPER Kconfig option
Adrian Bunk [Fri, 19 Oct 2007 23:01:08 +0000 (01:01 +0200)]
remove duplicate MMAPPER Kconfig option

This option is already in arch/um/Kconfig.char

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Jeff Dike <jdike@addtoit.com>
17 years agofix up security_socket_getpeersec_* documentation
Serge Hallyn [Fri, 19 Oct 2007 22:53:30 +0000 (00:53 +0200)]
fix up security_socket_getpeersec_* documentation

Update the security_socket_peersec documentation in
include/linux/security.h.  security_socket_peersec has been split
into two functions - _stream and _dgram, with new capabilities.

Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agochanged email
Johann Deneux [Fri, 19 Oct 2007 22:47:32 +0000 (00:47 +0200)]
changed email

Changed email address of Johann Deneux (myself)
Also removed CVS tags in comments (no longer using cvs)

Signed-off-by: Johann Deneux <johann.deneux@gmail.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agopowerpc: Remove obsolete prototype
Julio M. Merino Vidal [Fri, 19 Oct 2007 22:36:33 +0000 (00:36 +0200)]
powerpc: Remove obsolete prototype

The include/asm-powerpc/paca.h file has a prototype for a function that
does not exist any more; its name is setup_boot_paca.  This function was
removed in commit 4ba99b97dadd35b9ce1438b2bc7c992a4a14a8b1, so its
prototype should have been removed at that time too.

Signed-off-by: Julio M. Merino Vidal <jmerino@ac.upc.edu>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agotrivial comment wording/typo fix regarding taint flags
Daniel Roesen [Fri, 19 Oct 2007 22:30:06 +0000 (00:30 +0200)]
trivial comment wording/typo fix regarding taint flags

Signed-off-by: Daniel Roesen <dr@cluenet.de>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoLIB: Replace inappropriate include of <linux/bug.h>
Robert P. J. Day [Fri, 19 Oct 2007 22:25:12 +0000 (00:25 +0200)]
LIB: Replace inappropriate include of <linux/bug.h>

Replace an irrelevant include of bug.h with the more appropriate
includes of slab.h and module.h.

it's not as if the original inclusion is an error, it's simply not
related to the contents of that source file, while the other two are.

compile-tested on i386.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoH8300: Typo: "buildin" -> "builtin"
Robert P. J. Day [Fri, 19 Oct 2007 22:26:06 +0000 (00:26 +0200)]
H8300: Typo: "buildin" -> "builtin"

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Remove unreferenced "blkmtd_*" parms
Robert P. J. Day [Fri, 19 Oct 2007 22:22:16 +0000 (00:22 +0200)]
Documentation: Remove unreferenced "blkmtd_*" parms

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoXTENSA: Emphasize that the "eth" boot-time parm takes a value
Robert P. J. Day [Fri, 19 Oct 2007 22:20:15 +0000 (00:20 +0200)]
XTENSA: Emphasize that the "eth" boot-time parm takes a value

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoBOOT: Show that no_ipi_broadcast() takes a parameter.
Robert P. J. Day [Fri, 19 Oct 2007 22:19:06 +0000 (00:19 +0200)]
BOOT: Show that no_ipi_broadcast() takes a parameter.

a rather obvious fix given the opening of the function:

...
static __init int no_ipi_broadcast(char *str)
{
        get_option(&str, &no_broadcast);
...

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Add nested versions of mutex locks to docs
Robert P. J. Day [Fri, 19 Oct 2007 22:15:26 +0000 (00:15 +0200)]
Documentation: Add nested versions of mutex locks to docs

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Remove reference to non-existent "unwind_debug" kernel parm
Robert P. J. Day [Fri, 19 Oct 2007 22:12:55 +0000 (00:12 +0200)]
Documentation: Remove reference to non-existent "unwind_debug" kernel parm

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Fix erroneous "dmascc=" documentation
Robert P. J. Day [Fri, 19 Oct 2007 22:11:36 +0000 (00:11 +0200)]
Documentation: Fix erroneous "dmascc=" documentation

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Remove references to dead "eda" and "edb" kernel parms
Robert P. J. Day [Fri, 19 Oct 2007 22:03:32 +0000 (00:03 +0200)]
Documentation: Remove references to dead "eda" and "edb" kernel parms

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Remove references to dead "cyclades=" boot option
Robert P. J. Day [Fri, 19 Oct 2007 22:01:12 +0000 (00:01 +0200)]
Documentation: Remove references to dead "cyclades=" boot option

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Remove reference to non-existent "applicom" kernel parm
Robert P. J. Day [Fri, 19 Oct 2007 21:47:50 +0000 (23:47 +0200)]
Documentation: Remove reference to non-existent "applicom" kernel parm

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Remove references to dead "noasync" kernel parm
Robert P. J. Day [Fri, 19 Oct 2007 21:33:35 +0000 (23:33 +0200)]
Documentation: Remove references to dead "noasync" kernel parm

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Remove reference to dead "lasi" kernel parm
Robert P. J. Day [Fri, 19 Oct 2007 21:32:16 +0000 (23:32 +0200)]
Documentation: Remove reference to dead "lasi" kernel parm

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Delete final reference to "sg_def_reserved_size" kernel parm
Robert P. J. Day [Fri, 19 Oct 2007 21:28:40 +0000 (23:28 +0200)]
Documentation: Delete final reference to "sg_def_reserved_size" kernel parm

given the following:

$ grep -rw sg_def_reserved_size *
Documentation/kernel-parameters.txt:    sg_def_reserved_size=   [SCSI]
$

that kernel parameter looks exceedingly dead.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Remove remaining useless reference to acpi_fake_ecdt
Robert P. J. Day [Fri, 19 Oct 2007 21:27:18 +0000 (23:27 +0200)]
Documentation: Remove remaining useless reference to acpi_fake_ecdt

>From commit cd8c93a4e04dce8f00d1ef3a476aac8bd65ae40b:

"Similar functionality was turned on by acpi_fake_ecdt=1 command line
before. Now it is on all the time."

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoSpelling fix: explicitly
Jean Delvare [Fri, 19 Oct 2007 21:22:55 +0000 (23:22 +0200)]
Spelling fix: explicitly

From: Jean Delvare <khali@linux-fr.org>

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agomore UTF-8 conversions
Marcin Garski [Fri, 19 Oct 2007 21:22:11 +0000 (23:22 +0200)]
more UTF-8 conversions

Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoConvert files to UTF-8 and some cleanups
Jan Engelhardt [Fri, 19 Oct 2007 21:21:04 +0000 (23:21 +0200)]
Convert files to UTF-8 and some cleanups

* Convert files to UTF-8.

  * Also correct some people's names
    (one example is Eißfeldt, which was found in a source file.
    Given that the author used an ß at all in a source file
    indicates that the real name has in fact a 'ß' and not an 'ss',
    which is commonly used as a substitute for 'ß' when limited to
    7bit.)

  * Correct town names (Goettingen -> Göttingen)

  * Update Eberhard Mönkeberg's address (http://lkml.org/lkml/2007/1/8/313)

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Delete dead OSS-related kernel parameter.
Robert P. J. Day [Fri, 19 Oct 2007 21:15:26 +0000 (23:15 +0200)]
Documentation: Delete dead OSS-related kernel parameter.

Since the OSS-related "sb" kernel parameter doesn't seem to be
supported, drop its reference from the kernel-parameters.txt file.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDocumentation: Drop reference to dead "eicon" kernel paramter.
Robert P. J. Day [Fri, 19 Oct 2007 21:14:24 +0000 (23:14 +0200)]
Documentation: Drop reference to dead "eicon" kernel paramter.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Acked-by: Armin Schindler <armin@melware.de>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoDrop the superfluous test for an old version of gcc.
Robert P. J. Day [Fri, 19 Oct 2007 21:13:32 +0000 (23:13 +0200)]
Drop the superfluous test for an old version of gcc.

The header file <linux/compiler.h> already enforces a suitably recent
version of gcc, so there's no point checking for that again.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoRemove long-dead commented-out MODULE_PARM reference.
Robert P. J. Day [Fri, 19 Oct 2007 21:12:43 +0000 (23:12 +0200)]
Remove long-dead commented-out MODULE_PARM reference.

Remove the useless comment referring to the obsolete MODULE_PARM
macro.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoExplain clearly why kmalloc() can't use __GFP_HIGHMEM.
Robert P. J. Day [Fri, 19 Oct 2007 21:11:38 +0000 (23:11 +0200)]
Explain clearly why kmalloc() can't use __GFP_HIGHMEM.

Fix the wishy-washy comment to clearly explain why kmalloc() can't
use the __GFP_HIGHMEM zone modifier.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoFix misspellings of "system", "controller", "interrupt" and "necessary".
Robert P. J. Day [Fri, 19 Oct 2007 21:10:43 +0000 (23:10 +0200)]
Fix misspellings of "system", "controller", "interrupt" and "necessary".

Fix the various misspellings of "system", controller", "interrupt" and
"[un]necessary".

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agocrypto: convert crypto.h to UTF-8
John Anthony Kazos Jr [Fri, 19 Oct 2007 21:07:36 +0000 (23:07 +0200)]
crypto: convert crypto.h to UTF-8

Convert the encoding of <include/linux/crypto.h> from ISO-8859-1 to UTF-8.

Signed-off-by: John Anthony Kazos Jr. <jakj@j-a-k-j.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agocrypto: convert "crypto" subdirectory to UTF-8
John Anthony Kazos Jr [Fri, 19 Oct 2007 21:06:17 +0000 (23:06 +0200)]
crypto: convert "crypto" subdirectory to UTF-8

Convert the subdirectory "crypto" to UTF-8. The files changed are
<crypto/fcrypt.c> and <crypto/api.c>.

Signed-off-by: John Anthony Kazos Jr. <jakj@j-a-k-j.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agofix typos in drivers/block/Kconfig
Patrick Ringl [Fri, 19 Oct 2007 21:05:02 +0000 (23:05 +0200)]
fix typos in drivers/block/Kconfig

Signed-off-by: Adrian Bunk <bunk@kernel.org>
17 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Fri, 19 Oct 2007 20:12:46 +0000 (13:12 -0700)]
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (41 commits)
  ACPICA: hw: Don't carry spinlock over suspend
  ACPICA: hw: remove use_lock flag from acpi_hw_register_{read, write}
  ACPI: cpuidle: port idle timer suspend/resume workaround to cpuidle
  ACPI: clean up acpi_enter_sleep_state_prep
  Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish
  ACPI: suppress uninitialized var warning
  cpuidle: consolidate 2.6.22 cpuidle branch into one patch
  ACPI: thinkpad-acpi: skip blanks before the data when parsing sysfs
  ACPI: AC: Add sysfs interface
  ACPI: SBS: Add sysfs alarm
  ACPI: SBS: Add ACPI_PROCFS around procfs handling code.
  ACPI: SBS: Add support for power_supply class (and sysfs)
  ACPI: SBS: Make SBS reads table-driven.
  ACPI: SBS: Simplify data structures in SBS
  ACPI: SBS: Split host controller (ACPI0001) from SBS driver (ACPI0002)
  ACPI: EC: Add new query handler to list head.
  ACPI: Add acpi_bus_generate_event4() function
  ACPI: Battery: add sysfs alarm
  ACPI: Battery: Add sysfs support
  ACPI: Battery: Misc clean-ups, no functional changes
  ...

Fix up conflicts in drivers/misc/thinkpad_acpi.[ch] manually

17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
Linus Torvalds [Fri, 19 Oct 2007 19:07:03 +0000 (12:07 -0700)]
Merge git://git./linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: fix guest time accounting going faster than user time accounting

17 years agoMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Linus Torvalds [Fri, 19 Oct 2007 19:01:22 +0000 (12:01 -0700)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Delete totally outdated Documentation/mips/time.README
  [MIPS] Kill duplicated setup_irq() for cp0 timer
  [MIPS] Sibyte: Finish conversion to modern time APIs.
  [MIPS] time: Helpers to compute clocksource/event shift and mult values.
  [MIPS] SMTC: Build fix.
  [MIPS] time: Delete dead code.
  [MIPS] MIPSsim: Strip defconfig file to the bones.

17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Linus Torvalds [Fri, 19 Oct 2007 19:00:58 +0000 (12:00 -0700)]
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (51 commits)
  [CIFS] log better errors on failed mounts
  [CIFS] Return better error when server requires signing but client forbids
  [CIFS] fix typo
  [CIFS] acl support part 4
  [CIFS] Fix minor problems noticed by scan
  [CIFS] fix bad handling of EAGAIN error on kernel_recvmsg in cifs_demultiplex_thread
  [CIFS] build break
  [CIFS] endian fixes
  [CIFS] endian fixes in new acl code
  [CIFS] Fix some endianness problems in new acl code
  [CIFS] missing #endif from a previous patch
  [CIFS] formatting fixes
  [CIFS] Break up unicode_sessetup string functions
  [CIFS] parse server_GUID in SPNEGO negProt response
  [CIFS]
  [CIFS] Fix endian conversion problem in posix mkdir
  [CIFS] fix build break when lanman not enabled
  [CIFS] remove two sparse warnings
  [CIFS] remove compile warnings when debug disabled
  [CIFS] CIFS ACL support part 3
  ...

17 years agoMerge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
Linus Torvalds [Fri, 19 Oct 2007 18:57:05 +0000 (11:57 -0700)]
Merge ssh:///linux/kernel/git/tglx/linux-2.6-x86

* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86:
  x86: fix global_flush_tlb() bug

17 years agoMerge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
Linus Torvalds [Fri, 19 Oct 2007 18:55:50 +0000 (11:55 -0700)]
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] cleanup fid types mess
  [XFS] fixups after behavior removal merge into mainline git

17 years agoMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Fri, 19 Oct 2007 18:54:39 +0000 (11:54 -0700)]
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Fix possible dev_deactivate race condition
  [INET]: Justification for local port range robustness.
  [PACKET]: Kill unused pg_vec_endpage() function
  [NET]: QoS/Sched as menuconfig
  [NET]: Fix bug in sk_filter race cures.
  [PATCH] mac80211: make ieee802_11_parse_elems return void

17 years agoNULL terminate the pci_device_ids in pasemi_edac
Stephen Rothwell [Fri, 19 Oct 2007 06:41:11 +0000 (23:41 -0700)]
NULL terminate the pci_device_ids in pasemi_edac

Fixes:
drivers/edac/pasemi_edac: struct pci_device_id is 32 bytes.  The last of 1 is:
0x00 0x00 0x19 0x59 0x00 0x00 0xa0 0x0a 0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
FATAL: drivers/edac/pasemi_edac: struct pci_device_id is not terminated with a NULL entry!

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Douglas Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoUninline fork.c/exit.c
Alexey Dobriyan [Fri, 19 Oct 2007 06:41:10 +0000 (23:41 -0700)]
Uninline fork.c/exit.c

Save ~650 bytes here.

add/remove: 4/0 grow/shrink: 0/7 up/down: 430/-1088 (-658)
function                                     old     new   delta
__copy_fs_struct                               -     202    +202
__put_fs_struct                                -     112    +112
__exit_fs                                      -      58     +58
__exit_files                                   -      58     +58
exit_files                                    58       2     -56
put_fs_struct                                112       5    -107
exit_fs                                      161       2    -159
sys_unshare                                  774     590    -184
copy_process                                4031    3840    -191
do_exit                                     1791    1597    -194
copy_fs_struct                               202       5    -197

No difference in lmbench lat_proc tests on 2-way Opteron 246.
Smaaaal degradation on UP P4 (within errors).

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agokernel/fork.c: remove unneeded variable initialization in copy_process()
Mariusz Kozlowski [Fri, 19 Oct 2007 06:41:09 +0000 (23:41 -0700)]
kernel/fork.c: remove unneeded variable initialization in copy_process()

This initialization of is not needed so just remove it.

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoLinux Kernel Markers - Documentation
Mathieu Desnoyers [Fri, 19 Oct 2007 06:41:08 +0000 (23:41 -0700)]
Linux Kernel Markers - Documentation

Here is some documentation explaining what is/how to use the Linux
Kernel Markers.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: "Frank Ch. Eigler" <fche@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoLinux Kernel Markers - Samples
Mathieu Desnoyers [Fri, 19 Oct 2007 06:41:08 +0000 (23:41 -0700)]
Linux Kernel Markers - Samples

Module example showing how to use the Linux Kernel Markers.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agomarkers: Add samples subdir
Mathieu Desnoyers [Fri, 19 Oct 2007 06:41:07 +0000 (23:41 -0700)]
markers: Add samples subdir

Begin infrastructure for kernel code samples in the samples/ directory.
Add its Kconfig and Kbuild files.
Source its Kconfig file in all arch/ Kconfigs.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoLinux Kernel Markers
Mathieu Desnoyers [Fri, 19 Oct 2007 06:41:06 +0000 (23:41 -0700)]
Linux Kernel Markers

The marker activation functions sits in kernel/marker.c.  A hash table is used
to keep track of the registered probes and armed markers, so the markers
within a newly loaded module that should be active can be activated at module
load time.

marker_query has been removed. marker_get_first, marker_get_next and
marker_release should be used as iterators on the markers.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: "Frank Ch. Eigler" <fche@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Mike Mason <mmlnx@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoCombine instrumentation menus in kernel/Kconfig.instrumentation
Mathieu Desnoyers [Fri, 19 Oct 2007 06:41:05 +0000 (23:41 -0700)]
Combine instrumentation menus in kernel/Kconfig.instrumentation

Quoting Randy:

"It seems sad that this patch sources Kconfig.marker, a 7-line file,
20-something times.  Yes, you (we) don't want to put those 7 lines into
20-something different files, so sourcing is the right thing.

However, what you did for avr32 seems more on the right track to me: make
_one_ Instrumentation support menu that includes PROFILING, OPROFILE, KPROBES,
and MARKERS and then use (source) that in all of the arches."

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoChange struct marker users
Mathieu Desnoyers [Fri, 19 Oct 2007 06:41:04 +0000 (23:41 -0700)]
Change struct marker users

Prior to use struct marker in the linux kernel markers, we need to clean
two drivers which use this structure name.

Change bonding driver types :
- struct marker to struct bond_marker.
- marker_t to bond_marker_t.
- marker_header to bond_marker_header.
- marker_header_t to bond_marker_header_t.

Change qla4xxx struct marker_entry usage :
- Change struct marker_entry for struct qla4_marker_entry.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Chad Tindel <ctindel@users.sourceforge.net>
Cc: Jay Vosburgh <fubar@us.ibm.com>
Cc: David Somayajulu <david.somayajulu@qlogic.com>
Cc: James Bottomley <James.Bottomley@SteelEye.com>
Cc: Ravi Anand <ravi.anand@qlogic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoHook up group scheduler with control groups
Srivatsa Vaddagiri [Fri, 19 Oct 2007 06:41:03 +0000 (23:41 -0700)]
Hook up group scheduler with control groups

Enable "cgroup" (formerly containers) based fair group scheduling.  This
will let administrator create arbitrary groups of tasks (using "cgroup"
pseudo filesystem) and control their cpu bandwidth usage.

[akpm@linux-foundation.org: fix cpp condition]
Signed-off-by: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoAdd documentation for extended crashkernel syntax
Bernhard Walle [Fri, 19 Oct 2007 06:41:02 +0000 (23:41 -0700)]
Add documentation for extended crashkernel syntax

This adds the documentation for the extended crashkernel syntax into
Documentation/kdump/kdump.txt.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoUse extended crashkernel command line on sh
Bernhard Walle [Fri, 19 Oct 2007 06:41:02 +0000 (23:41 -0700)]
Use extended crashkernel command line on sh

This patch removes the crashkernel parsing from arch/sh/kernel/machine_kexec.c
and calls the generic function, introduced in the generic patch, in
setup_bootmem_allocator().

This is necessary because the amount of System RAM must be known in this
function now because of the new syntax.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoUse extended crashkernel command line on ppc64
Bernhard Walle [Fri, 19 Oct 2007 06:41:01 +0000 (23:41 -0700)]
Use extended crashkernel command line on ppc64

This patch adapts the ppc64 code to use the generic parse_crashkernel()
function introduced in the generic patch of that series.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoUse extended crashkernel command line on ia64
Bernhard Walle [Fri, 19 Oct 2007 06:41:00 +0000 (23:41 -0700)]
Use extended crashkernel command line on ia64

This patch adapts IA64 to use the generic parse_crashkernel() function instead
of its own parsing for the crashkernel command line.

Because the total amount of System RAM must be known when calling this
function, efi_memmap_init() is modified to return its accumulated total_memory
variable.

Also, the crashkernel handling is moved in an own function in
arch/ia64/kernel/setup.c to make the code more readable.

[kamalesh@linux.vnet.ibm.com: build fix]
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoUse extended crashkernel command line on x86_64
Bernhard Walle [Fri, 19 Oct 2007 06:40:59 +0000 (23:40 -0700)]
Use extended crashkernel command line on x86_64

This patch removes the crashkernel parsing from
arch/x86_64/kernel/machine_kexec.c and calls the generic function, introduced
in the last patch, in setup_bootmem_allocator().

This is necessary because the amount of System RAM must be known in this
function now because of the new syntax.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoUse extended crashkernel command line on i386
Bernhard Walle [Fri, 19 Oct 2007 06:40:59 +0000 (23:40 -0700)]
Use extended crashkernel command line on i386

This patch removes the crashkernel parsing from
arch/i386/kernel/machine_kexec.c and calls the generic function, introduced in
the last patch, in setup_bootmem_allocator().

This is necessary because the amount of System RAM must be known in this
function now because of the new syntax.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoExtended crashkernel command line
Bernhard Walle [Fri, 19 Oct 2007 06:40:58 +0000 (23:40 -0700)]
Extended crashkernel command line

This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:

    crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
    range=start-[end]

For example:

    crashkernel=512M-2G:64M,2G-:128M

The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.

This series implements this change for i386, x86_64, ia64, ppc64 and sh.  That
should be all platforms that support kdump in current mainline.  I tested all
platforms except sh due to the lack of a sh processor.

This patch:

This is the generic part of the patch.  It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory.  That function takes the whole command line and
looks itself for "crashkernel=" in it.

If there are multiple occurrences, then the last one is taken.  The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoIPC: fix error case when idr-cache is empty in ipcget()
Pierre Peiffer [Fri, 19 Oct 2007 06:40:57 +0000 (23:40 -0700)]
IPC: fix error case when idr-cache is empty in ipcget()

With the use of idr to store the ipc, the case where the idr cache is
empty, when idr_get_new is called (this may happen even if we call
idr_pre_get() before), is not well handled: it lets
semget()/shmget()/msgget() return ENOSPC when this cache is empty, what 1.
does not reflect the facts and 2.  does not conform to the man(s).

This patch fixes this by retrying the whole process of allocation in this case.

Signed-off-by: Pierre Peiffer <pierre.peiffer@bull.net>
Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agovirtualization of sysv msg queues is incomplete
Kirill Korotaev [Fri, 19 Oct 2007 06:40:56 +0000 (23:40 -0700)]
virtualization of sysv msg queues is incomplete

Virtualization of sysv msg queues is incomplete: msg_hdrs and msg_bytes
variables visible from userspace are global.  Let's make them
per-namespace.

Signed-off-by: Alexey Kuznetsov <alexey@openvz.org>
Signed-off-by: Kirill Korotaev <dev@openvz.org>
Cc: Pierre Peiffer <pierre.peiffer@bull.net>
Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Cc: Serge Hallyn <serue@us.ibm.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoIPC: cleanup some code and wrong comments about semundo list managment
Pierre Peiffer [Fri, 19 Oct 2007 06:40:55 +0000 (23:40 -0700)]
IPC: cleanup some code and wrong comments about semundo list managment

Some comments about sem_undo_list seem wrong.
About the comment above unlock_semundo:
"... If task2 now exits before task1 releases the lock (by calling
unlock_semundo()), then task1 will never call spin_unlock(). ..."

This is just wrong, I see no reason for which task1 will not call
spin_unlock... The rest of this comment is also wrong... Unless I
miss something (of course).

Finally, (un)lock_semundo functions are useless, so remove them
for simplification. (this avoids an useless if statement)

Signed-off-by: Pierre Peiffer <pierre.peiffer@bull.net>
Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoipc: remove unneeded parameters
Nadia Derbey [Fri, 19 Oct 2007 06:40:55 +0000 (23:40 -0700)]
ipc: remove unneeded parameters

Remvoe the unneeded parameters from ipc_checkid() and ipc_buildid()
interfaces.

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agofix idr_find() locking
Nadia Derbey [Fri, 19 Oct 2007 06:40:54 +0000 (23:40 -0700)]
fix idr_find() locking

This is a patch that fixes the way idr_find() used to be called in ipc_lock():
in all the paths that don't imply an update of the ipcs idr, it was called
without the idr tree being locked.

The changes are:
  . in ipc_ids, the mutex has been changed into a reader/writer semaphore.
  . ipc_lock() now takes the mutex as a reader during the idr_find().
  . a new routine ipc_lock_down() has been defined: it doesn't take the
    mutex, assuming that it is being held by the caller. This is the routine
    that is now called in all the update paths.

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Acked-by: Jarek Poplawski <jarkao2@o2.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoipc: fix wrong comments
Nadia Derbey [Fri, 19 Oct 2007 06:40:53 +0000 (23:40 -0700)]
ipc: fix wrong comments

This patch fixes the wrong / obsolete comments in the ipc code.  Also adds
a missing lock around ipc_get_maxid() in shm_get_stat().

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoipc: inline ipc_buildid()
Nadia Derbey [Fri, 19 Oct 2007 06:40:52 +0000 (23:40 -0700)]
ipc: inline ipc_buildid()

This is a trivial patch that changes the ipc_buildid() routine into a static
inline.

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoipc: introduce the ipcid_to_idx macro
Nadia Derbey [Fri, 19 Oct 2007 06:40:52 +0000 (23:40 -0700)]
ipc: introduce the ipcid_to_idx macro

This is a trivial patch that changes all the (id % SEQ_MULTIPLIER) into a call
to the ipcid_to_idx(id) macro.

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoStoring ipcs into IDRs
Nadia Derbey [Fri, 19 Oct 2007 06:40:51 +0000 (23:40 -0700)]
Storing ipcs into IDRs

This patch converts casts of struct kern_ipc_perm to
   . struct msg_queue
   . struct sem_array
   . struct shmid_kernel
into the equivalent container_of() macro. It improves code maintenance
because the code need not change if kern_ipc_perm is no longer at the
beginning of the containing struct.

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoipc: integrate ipc_checkid() into ipc_lock()
Nadia Derbey [Fri, 19 Oct 2007 06:40:51 +0000 (23:40 -0700)]
ipc: integrate ipc_checkid() into ipc_lock()

This patch introduces a new ipc_lock_check() routine interface:
   . each time ipc_checkid() is called, this is done after calling ipc_lock().
     ipc_checkid() is now called from inside ipc_lock_check().

[akpm@linux-foundation.org: build fix]
[akpm@linux-foundation.org: fix RCU locking]
Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoipc: remove the ipc_get() routine
Nadia Derbey [Fri, 19 Oct 2007 06:40:50 +0000 (23:40 -0700)]
ipc: remove the ipc_get() routine

This is a trivial patch that removes the ipc_get() routine: it is replaced
by a call to idr_find().

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoipc: unify the syscalls code
Nadia Derbey [Fri, 19 Oct 2007 06:40:49 +0000 (23:40 -0700)]
ipc: unify the syscalls code

This patch introduces a change into the sys_msgget(), sys_semget() and
sys_shmget() routines: they now share a common code, which is better for
maintainability.

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoipc: store ipcs into IDRs
Nadia Derbey [Fri, 19 Oct 2007 06:40:48 +0000 (23:40 -0700)]
ipc: store ipcs into IDRs

This patch introduces ipcs storage into IDRs. The main changes are:
  . This ipc_ids structure is changed: the entries array is changed into a
    root idr structure.
  . The grow_ary() routine is removed: it is not needed anymore when adding
    an ipc structure, since we are now using the IDR facility.
  . The ipc_rmid() routine interface is changed:
       . there is no need for this routine to return the pointer passed in as
         argument: it is now declared as a void
       . since the id is now part of the kern_ipc_perm structure, no need to
         have it as an argument to the routine

Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoAdd irq protection in the percpu-counters cpu-hotplug-callback path
Gautham R Shenoy [Fri, 19 Oct 2007 06:40:47 +0000 (23:40 -0700)]
Add irq protection in the percpu-counters cpu-hotplug-callback path

Some of the per-cpu counters and thus their locks are accessed from IRQ
contexts.  This can cause a deadlock if it interrupts a cpu-offline thread
which is transferring a dead-cpu's counts to the global counter.

Add appropriate IRQ protection in the cpu-hotplug callback path.

Signed-off-by: Gautham R Shenoy <ego@in.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoCPU HOTPLUG: avoid hotadd when proper possible_map isn't specified
KAMEZAWA Hiroyuki [Fri, 19 Oct 2007 06:40:47 +0000 (23:40 -0700)]
CPU HOTPLUG: avoid hotadd when proper possible_map isn't specified

cpu-hot-add should be fail if cpu is not set in cpu_possible_map.  If go
ahead, the system will panic soon.

Especially, arch which requires additional_cpus= parameter should handle
this.  Tested on ia64.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agohotplug cpu: migrate a task within its cpuset
Cliff Wickman [Fri, 19 Oct 2007 06:40:46 +0000 (23:40 -0700)]
hotplug cpu: migrate a task within its cpuset

When a cpu is disabled, move_task_off_dead_cpu() is called for tasks that have
been running on that cpu.

Currently, such a task is migrated:
 1) to any cpu on the same node as the disabled cpu, which is both online
    and among that task's cpus_allowed
 2) to any cpu which is both online and among that task's cpus_allowed

It is typical of a multithreaded application running on a large NUMA system to
have its tasks confined to a cpuset so as to cluster them near the memory that
they share.  Furthermore, it is typical to explicitly place such a task on a
specific cpu in that cpuset.  And in that case the task's cpus_allowed
includes only a single cpu.

This patch would insert a preference to migrate such a task to some cpu within
its cpuset (and set its cpus_allowed to its entire cpuset).

With this patch, migrate the task to:
 1) to any cpu on the same node as the disabled cpu, which is both online
    and among that task's cpus_allowed
 2) to any online cpu within the task's cpuset
 3) to any cpu which is both online and among that task's cpus_allowed

In order to do this, move_task_off_dead_cpu() must make a call to
cpuset_cpus_allowed_locked(), a new subset of cpuset_cpus_allowed(), that will
not block.  (name change - per Oleg's suggestion)

Calls are made to cpuset_lock() and cpuset_unlock() in migration_call() to set
the cpuset mutex during the whole migrate_live_tasks() and
migrate_dead_tasks() procedure.

[akpm@linux-foundation.org: build fix]
[pj@sgi.com: Fix indentation and spacing]
Signed-off-by: Cliff Wickman <cpw@sgi.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Paul Jackson <pj@sgi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoControl groups: Replace "cont" with "cgrp" and other misc renaming
Paul Menage [Fri, 19 Oct 2007 06:40:44 +0000 (23:40 -0700)]
Control groups: Replace "cont" with "cgrp" and other misc renaming

Replace "cont" with "cgrp" and other misc renaming

This patch finishes some of the names that got missed in the great
"task containers" -> "control groups" rename. Primarily it renames
the local variable "cont" to "cgrp" in a number of places, and renames
the CONT_* enum members to CGRP_*.

This patch is not intended to have any effect on the generated code;
the output of "objdump -d kernel/cgroup.o" is unchanged.

Signed-off-by: Paul Menage <menage@google.com>
Acked-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoUse task_pid_nr() instead of pid_nr(task_pid())
Pavel Emelyanov [Fri, 19 Oct 2007 06:40:44 +0000 (23:40 -0700)]
Use task_pid_nr() instead of pid_nr(task_pid())

There are two places that do so - the cgroups subsystem and the autofs
code.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Ian Kent <raven@themaw.net>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>