From: Linus Torvalds Date: Fri, 17 Oct 2008 16:50:12 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 X-Git-Tag: v2.6.28-rc1~258 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=26e9a397774a0e94efbb8a0bf4a952c28d808cab;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (25 commits) staging: at76_usb wireless driver Staging: workaround build system bug Staging: Lindent sxg.c Staging: SLICOSS: Call pci_release_regions at driver exit Staging: SLICOSS: Fix remaining type names Staging: SLICOSS: Fix warnings due to static usage Staging: SLICOSS: lots of checkpatch fixes Staging: go7007 v4l fixes Staging: Fix gcc warnings in sxg Staging: add echo cancelation module Staging: add wlan-ng prism2 usb driver Staging: add w35und wifi driver Staging: USB/IP: add host driver Staging: USB/IP: add client driver Staging: USB/IP: add common functions needed Staging: add the go7007 video driver Staging: add me4000 pci data collection driver Staging: add me4000 firmware files Staging: add sxg network driver Staging: add Alacritech slicoss network driver ... Fixed up conflicts due to taint flags changes and MAINTAINERS cleanup in MAINTAINERS, include/linux/kernel.h and kernel/panic.c. --- 26e9a397774a0e94efbb8a0bf4a952c28d808cab diff --cc MAINTAINERS index 52702b057c0,ea6b4782e2f..355c192d699 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -3931,13 -3855,7 +3931,13 @@@ L: cbe-oss-dev@ozlabs.or W: http://www.ibm.com/developerworks/power/cell/ S: Supported -STABLE BRANCH: +SRM (Alpha) environment access +P: Jan-Benedict Glaw +M: jbglaw@lug-owl.de +L: linux-kernel@vger.kernel.org +S: Maintained + - STABLE BRANCH: ++STABLE BRANCH P: Greg Kroah-Hartman M: greg@kroah.com P: Chris Wright @@@ -3945,6 -3863,69 +3945,13 @@@ M: chrisw@sous-sol.or L: stable@kernel.org S: Maintained -STAGING SUBSYSTEM: ++STAGING SUBSYSTEM + P: Greg Kroah-Hartman + M: gregkh@suse.de + L: linux-kernel@vger.kernel.org + T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ + S: Maintained + -SHARP LH SUPPORT (LH7952X & LH7A40X) -P: Marc Singer -M: elf@buici.com -W: http://projects.buici.com/arm -L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) -S: Maintained - -SHPC HOTPLUG DRIVER -P: Kristen Carlson Accardi -M: kristen.c.accardi@intel.com -L: linux-pci@vger.kernel.org -S: Supported - -SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER -P: Pierre Ossman -M: drzeus-sdhci@drzeus.cx -L: sdhci-devel@list.drzeus.cx -S: Maintained - -SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS -P: Stephen Hemminger -M: shemminger@linux-foundation.org -L: netdev@vger.kernel.org -S: Maintained - -SOEKRIS NET48XX LED SUPPORT -P: Chris Boot -M: bootc@bootc.net -S: Maintained - -SPARC (sparc32): -P: William L. Irwin -M: wli@holomorphy.com -L: sparclinux@vger.kernel.org -S: Maintained - -SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER -P: Roger Wolff -M: R.E.Wolff@BitWizard.nl -L: linux-kernel@vger.kernel.org ? -S: Supported - -SPIDERNET NETWORK DRIVER for CELL -P: Ishizaki Kou -M: kou.ishizaki@toshiba.co.jp -P: Jens Osterkamp -M: jens@de.ibm.com -L: netdev@vger.kernel.org -S: Supported - -SRM (Alpha) environment access -P: Jan-Benedict Glaw -M: jbglaw@lug-owl.de -L: linux-kernel@vger.kernel.org -S: Maintained - STARFIRE/DURALAN NETWORK DRIVER P: Ion Badulescu M: ionut@cs.columbia.edu diff --cc include/linux/kernel.h index 6803318fa2e,b36805cb95f..5a566b705ca --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@@ -255,16 -250,17 +255,17 @@@ extern enum system_states SYSTEM_SUSPEND_DISK, } system_state; -#define TAINT_PROPRIETARY_MODULE (1<<0) -#define TAINT_FORCED_MODULE (1<<1) -#define TAINT_UNSAFE_SMP (1<<2) -#define TAINT_FORCED_RMMOD (1<<3) -#define TAINT_MACHINE_CHECK (1<<4) -#define TAINT_BAD_PAGE (1<<5) -#define TAINT_USER (1<<6) -#define TAINT_DIE (1<<7) -#define TAINT_OVERRIDDEN_ACPI_TABLE (1<<8) -#define TAINT_WARN (1<<9) -#define TAINT_CRAP (1<<10) +#define TAINT_PROPRIETARY_MODULE 0 +#define TAINT_FORCED_MODULE 1 +#define TAINT_UNSAFE_SMP 2 +#define TAINT_FORCED_RMMOD 3 +#define TAINT_MACHINE_CHECK 4 +#define TAINT_BAD_PAGE 5 +#define TAINT_USER 6 +#define TAINT_DIE 7 +#define TAINT_OVERRIDDEN_ACPI_TABLE 8 +#define TAINT_WARN 9 ++#define TAINT_CRAP 10 extern void dump_stack(void) __cold; diff --cc kernel/module.c index b7205f67cfa,152b1655bba..25bc9ac9e22 --- a/kernel/module.c +++ b/kernel/module.c @@@ -2583,10 -2561,12 +2592,12 @@@ static char *module_flags(struct modul mod->state == MODULE_STATE_GOING || mod->state == MODULE_STATE_COMING) { buf[bx++] = '('; - if (mod->taints & TAINT_PROPRIETARY_MODULE) + if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE)) buf[bx++] = 'P'; - if (mod->taints & TAINT_FORCED_MODULE) + if (mod->taints & (1 << TAINT_FORCED_MODULE)) buf[bx++] = 'F'; - if (mod->taints & TAINT_CRAP) ++ if (mod->taints & (1 << TAINT_CRAP)) + buf[bx++] = 'C'; /* * TAINT_FORCED_RMMOD: could be added. * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't diff --cc kernel/panic.c index f290e8e866f,98e2047f4db..bda561ef3cd --- a/kernel/panic.c +++ b/kernel/panic.c @@@ -143,26 -143,6 +143,27 @@@ NORET_TYPE void panic(const char * fmt EXPORT_SYMBOL(panic); + +struct tnt { + u8 bit; + char true; + char false; +}; + +static const struct tnt tnts[] = { + { TAINT_PROPRIETARY_MODULE, 'P', 'G' }, + { TAINT_FORCED_MODULE, 'F', ' ' }, + { TAINT_UNSAFE_SMP, 'S', ' ' }, + { TAINT_FORCED_RMMOD, 'R', ' ' }, + { TAINT_MACHINE_CHECK, 'M', ' ' }, + { TAINT_BAD_PAGE, 'B', ' ' }, + { TAINT_USER, 'U', ' ' }, + { TAINT_DIE, 'D', ' ' }, + { TAINT_OVERRIDDEN_ACPI_TABLE, 'A', ' ' }, + { TAINT_WARN, 'W', ' ' }, ++ { TAINT_CRAP, 'C', ' ' }, +}; + /** * print_tainted - return a string to represent the kernel taint state. *