From 2e553eaf16143783f8442d513823ba8146af0717 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Wed, 11 Mar 2009 23:33:18 +0900 Subject: [PATCH] --- yaml --- r: 138712 b: refs/heads/master c: bb6d59ca927d855ffac567b35c0a790c67016103 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/RCU/checklist.txt | 12 + .../feature-removal-schedule.txt | 9 + trunk/Documentation/networking/ipv6.txt | 35 + trunk/arch/arm/mach-omap2/board-ldp.c | 2 +- trunk/arch/m68knommu/platform/5206e/config.c | 1 + trunk/arch/m68knommu/platform/528x/config.c | 228 ----- trunk/arch/sh/boards/board-ap325rxa.c | 1 + trunk/arch/x86/Kconfig | 8 +- trunk/arch/x86/include/asm/cpu_debug.h | 193 ----- trunk/arch/x86/include/asm/desc.h | 3 +- trunk/arch/x86/include/asm/highmem.h | 1 + trunk/arch/x86/include/asm/kexec.h | 13 +- trunk/arch/x86/kernel/cpu/Makefile | 2 - trunk/arch/x86/kernel/cpu/common.c | 6 +- trunk/arch/x86/kernel/cpu/cpu_debug.c | 785 ------------------ .../arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 1 - trunk/arch/x86/kernel/cpu/mcheck/mce_64.c | 4 +- trunk/arch/x86/kernel/machine_kexec_32.c | 17 +- trunk/arch/x86/kernel/machine_kexec_64.c | 99 ++- trunk/arch/x86/kernel/quirks.c | 3 +- trunk/arch/x86/kernel/relocate_kernel_32.S | 24 +- trunk/arch/x86/kernel/relocate_kernel_64.S | 189 ++++- trunk/arch/x86/kernel/visws_quirks.c | 2 +- trunk/arch/x86/kernel/vmlinux_64.lds.S | 7 + trunk/arch/x86/lguest/boot.c | 21 +- trunk/arch/x86/mm/highmem_32.c | 17 +- trunk/arch/x86/mm/iomap_32.c | 13 +- trunk/arch/xtensa/Kconfig | 3 - trunk/arch/xtensa/kernel/setup.c | 2 + trunk/arch/xtensa/kernel/traps.c | 1 + trunk/arch/xtensa/mm/fault.c | 1 + trunk/arch/xtensa/platforms/iss/console.c | 6 +- trunk/drivers/base/node.c | 2 +- trunk/drivers/block/aoe/aoedev.c | 2 +- trunk/drivers/char/agp/amd64-agp.c | 13 +- trunk/drivers/char/agp/intel-agp.c | 8 +- trunk/drivers/cpufreq/cpufreq.c | 51 +- trunk/drivers/hwmon/lm85.c | 8 +- trunk/drivers/lguest/lguest_device.c | 6 + trunk/drivers/md/md.c | 30 +- trunk/drivers/mtd/devices/mtd_dataflash.c | 3 +- trunk/drivers/mtd/maps/physmap.c | 19 +- trunk/drivers/net/arm/ks8695net.c | 2 +- trunk/drivers/net/bonding/bond_main.c | 2 +- trunk/drivers/net/jme.c | 3 +- trunk/drivers/net/pcmcia/3c574_cs.c | 3 +- trunk/drivers/net/pcmcia/3c589_cs.c | 3 +- trunk/drivers/net/smc911x.h | 12 + trunk/drivers/net/sungem.c | 2 +- trunk/drivers/net/tg3.c | 3 +- trunk/drivers/net/tokenring/tmspci.c | 18 +- trunk/drivers/net/ucc_geth_mii.c | 4 +- trunk/drivers/net/usb/dm9601.c | 4 + trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 6 +- .../net/wireless/iwlwifi/iwl3945-base.c | 17 +- trunk/drivers/net/wireless/p54/p54common.c | 9 +- trunk/drivers/net/wireless/rt2x00/rt2500usb.c | 8 + trunk/drivers/net/wireless/rt2x00/rt73usb.c | 32 +- trunk/drivers/video/i810/i810_main.c | 5 +- trunk/drivers/video/sh_mobile_lcdcfb.c | 6 +- trunk/fs/btrfs/ctree.c | 10 +- trunk/fs/btrfs/disk-io.c | 4 +- trunk/fs/btrfs/extent-tree.c | 4 +- trunk/fs/btrfs/locking.c | 6 +- trunk/fs/btrfs/locking.h | 2 +- trunk/fs/devpts/inode.c | 5 - trunk/include/linux/cpufreq.h | 1 - trunk/include/linux/netdevice.h | 1 + trunk/include/net/net_namespace.h | 27 +- trunk/init/Kconfig | 30 +- trunk/kernel/fork.c | 11 +- trunk/kernel/tsacct.c | 6 +- trunk/kernel/user.c | 14 +- trunk/lib/idr.c | 2 +- trunk/net/802/tr.c | 2 + trunk/net/8021q/vlan_dev.c | 3 +- trunk/net/core/dev.c | 61 +- trunk/net/core/net-sysfs.c | 4 +- trunk/net/core/net_namespace.c | 3 - trunk/net/ipv4/icmp.c | 2 +- trunk/net/ipv4/tcp_ipv4.c | 2 +- trunk/net/ipv6/addrconf.c | 53 +- trunk/net/ipv6/af_inet6.c | 21 +- trunk/net/netlink/af_netlink.c | 10 +- trunk/net/sched/act_police.c | 13 +- trunk/net/sctp/protocol.c | 16 +- trunk/net/sctp/sm_sideeffect.c | 54 +- trunk/net/sctp/sm_statefuns.c | 16 +- trunk/net/wireless/reg.c | 3 +- 90 files changed, 764 insertions(+), 1614 deletions(-) create mode 100644 trunk/Documentation/networking/ipv6.txt delete mode 100755 trunk/arch/x86/include/asm/cpu_debug.h delete mode 100755 trunk/arch/x86/kernel/cpu/cpu_debug.c diff --git a/[refs] b/[refs] index cbc68468b455..6a810e034d64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8229d754383e8cd905c38b56bd7365c7fc10dfc1 +refs/heads/master: bb6d59ca927d855ffac567b35c0a790c67016103 diff --git a/trunk/Documentation/RCU/checklist.txt b/trunk/Documentation/RCU/checklist.txt index 6e253407b3dc..accfe2f5247d 100644 --- a/trunk/Documentation/RCU/checklist.txt +++ b/trunk/Documentation/RCU/checklist.txt @@ -298,3 +298,15 @@ over a rather long period of time, but improvements are always welcome! Note that, rcu_assign_pointer() and rcu_dereference() relate to SRCU just as they do to other forms of RCU. + +15. The whole point of call_rcu(), synchronize_rcu(), and friends + is to wait until all pre-existing readers have finished before + carrying out some otherwise-destructive operation. It is + therefore critically important to -first- remove any path + that readers can follow that could be affected by the + destructive operation, and -only- -then- invoke call_rcu(), + synchronize_rcu(), or friends. + + Because these primitives only wait for pre-existing readers, + it is the caller's responsibility to guarantee safety to + any subsequent readers. diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 5ddbe350487a..20d3b94703a4 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -335,3 +335,12 @@ Why: In 2.6.18 the Secmark concept was introduced to replace the "compat_net" Secmark, it is time to deprecate the older mechanism and start the process of removing the old code. Who: Paul Moore +--------------------------- + +What: sysfs ui for changing p4-clockmod parameters +When: September 2009 +Why: See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and + e088e4c9cdb618675874becb91b2fd581ee707e6. + Removal is subject to fixing any remaining bugs in ACPI which may + cause the thermal throttling not to happen at the right time. +Who: Dave Jones , Matthew Garrett diff --git a/trunk/Documentation/networking/ipv6.txt b/trunk/Documentation/networking/ipv6.txt new file mode 100644 index 000000000000..268e5c103dd8 --- /dev/null +++ b/trunk/Documentation/networking/ipv6.txt @@ -0,0 +1,35 @@ + +Options for the ipv6 module are supplied as parameters at load time. + +Module options may be given as command line arguments to the insmod +or modprobe command, but are usually specified in either the +/etc/modules.conf or /etc/modprobe.conf configuration file, or in a +distro-specific configuration file. + +The available ipv6 module parameters are listed below. If a parameter +is not specified the default value is used. + +The parameters are as follows: + +disable + + Specifies whether to load the IPv6 module, but disable all + its functionality. This might be used when another module + has a dependency on the IPv6 module being loaded, but no + IPv6 addresses or operations are desired. + + The possible values and their effects are: + + 0 + IPv6 is enabled. + + This is the default value. + + 1 + IPv6 is disabled. + + No IPv6 addresses will be added to interfaces, and + it will not be possible to open an IPv6 socket. + + A reboot is required to enable IPv6. + diff --git a/trunk/arch/arm/mach-omap2/board-ldp.c b/trunk/arch/arm/mach-omap2/board-ldp.c index f6a13451d1fd..6031e179926b 100644 --- a/trunk/arch/arm/mach-omap2/board-ldp.c +++ b/trunk/arch/arm/mach-omap2/board-ldp.c @@ -81,7 +81,7 @@ static inline void __init ldp_init_smc911x(void) } ldp_smc911x_resources[0].start = cs_mem_base + 0x0; - ldp_smc911x_resources[0].end = cs_mem_base + 0xf; + ldp_smc911x_resources[0].end = cs_mem_base + 0xff; udelay(100); eth_gpio = LDP_SMC911X_GPIO; diff --git a/trunk/arch/m68knommu/platform/5206e/config.c b/trunk/arch/m68knommu/platform/5206e/config.c index d01a5d2b7557..db902540bf2c 100644 --- a/trunk/arch/m68knommu/platform/5206e/config.c +++ b/trunk/arch/m68knommu/platform/5206e/config.c @@ -17,6 +17,7 @@ #include #include #include +#include /***************************************************************************/ diff --git a/trunk/arch/m68knommu/platform/528x/config.c b/trunk/arch/m68knommu/platform/528x/config.c index dfdb5c2ed8e6..44baeb225dc7 100644 --- a/trunk/arch/m68knommu/platform/528x/config.c +++ b/trunk/arch/m68knommu/platform/528x/config.c @@ -24,7 +24,6 @@ #include #include #include -#include #ifdef CONFIG_MTD_PARTITIONS #include @@ -33,233 +32,6 @@ /***************************************************************************/ void coldfire_reset(void); -static void coldfire_qspi_cs_control(u8 cs, u8 command); - -/***************************************************************************/ - -#if defined(CONFIG_SPI) - -#if defined(CONFIG_WILDFIRE) -#define SPI_NUM_CHIPSELECTS 0x02 -#define SPI_PAR_VAL 0x07 /* Enable DIN, DOUT, CLK */ -#define SPI_CS_MASK 0x18 - -#define FLASH_BLOCKSIZE (1024*64) -#define FLASH_NUMBLOCKS 16 -#define FLASH_TYPE "m25p80" - -#define M25P80_CS 0 -#define MMC_CS 1 - -#ifdef CONFIG_MTD_PARTITIONS -static struct mtd_partition stm25p_partitions[] = { - /* sflash */ - [0] = { - .name = "stm25p80", - .offset = 0x00000000, - .size = FLASH_BLOCKSIZE * FLASH_NUMBLOCKS, - .mask_flags = 0 - } -}; - -#endif - -#elif defined(CONFIG_WILDFIREMOD) - -#define SPI_NUM_CHIPSELECTS 0x08 -#define SPI_PAR_VAL 0x07 /* Enable DIN, DOUT, CLK */ -#define SPI_CS_MASK 0x78 - -#define FLASH_BLOCKSIZE (1024*64) -#define FLASH_NUMBLOCKS 64 -#define FLASH_TYPE "m25p32" -/* Reserve 1M for the kernel parition */ -#define FLASH_KERNEL_SIZE (1024 * 1024) - -#define M25P80_CS 5 -#define MMC_CS 6 - -#ifdef CONFIG_MTD_PARTITIONS -static struct mtd_partition stm25p_partitions[] = { - /* sflash */ - [0] = { - .name = "kernel", - .offset = FLASH_BLOCKSIZE * FLASH_NUMBLOCKS - FLASH_KERNEL_SIZE, - .size = FLASH_KERNEL_SIZE, - .mask_flags = 0 - }, - [1] = { - .name = "image", - .offset = 0x00000000, - .size = FLASH_BLOCKSIZE * FLASH_NUMBLOCKS - FLASH_KERNEL_SIZE, - .mask_flags = 0 - }, - [2] = { - .name = "all", - .offset = 0x00000000, - .size = FLASH_BLOCKSIZE * FLASH_NUMBLOCKS, - .mask_flags = 0 - } -}; -#endif - -#else -#define SPI_NUM_CHIPSELECTS 0x04 -#define SPI_PAR_VAL 0x7F /* Enable DIN, DOUT, CLK, CS0 - CS4 */ -#endif - -#ifdef MMC_CS -static struct coldfire_spi_chip flash_chip_info = { - .mode = SPI_MODE_0, - .bits_per_word = 16, - .del_cs_to_clk = 17, - .del_after_trans = 1, - .void_write_data = 0 -}; - -static struct coldfire_spi_chip mmc_chip_info = { - .mode = SPI_MODE_0, - .bits_per_word = 16, - .del_cs_to_clk = 17, - .del_after_trans = 1, - .void_write_data = 0xFFFF -}; -#endif - -#ifdef M25P80_CS -static struct flash_platform_data stm25p80_platform_data = { - .name = "ST M25P80 SPI Flash chip", -#ifdef CONFIG_MTD_PARTITIONS - .parts = stm25p_partitions, - .nr_parts = sizeof(stm25p_partitions) / sizeof(*stm25p_partitions), -#endif - .type = FLASH_TYPE -}; -#endif - -static struct spi_board_info spi_board_info[] __initdata = { -#ifdef M25P80_CS - { - .modalias = "m25p80", - .max_speed_hz = 16000000, - .bus_num = 1, - .chip_select = M25P80_CS, - .platform_data = &stm25p80_platform_data, - .controller_data = &flash_chip_info - }, -#endif -#ifdef MMC_CS - { - .modalias = "mmc_spi", - .max_speed_hz = 16000000, - .bus_num = 1, - .chip_select = MMC_CS, - .controller_data = &mmc_chip_info - } -#endif -}; - -static struct coldfire_spi_master coldfire_master_info = { - .bus_num = 1, - .num_chipselect = SPI_NUM_CHIPSELECTS, - .irq_source = MCF5282_QSPI_IRQ_SOURCE, - .irq_vector = MCF5282_QSPI_IRQ_VECTOR, - .irq_mask = ((0x01 << MCF5282_QSPI_IRQ_SOURCE) | 0x01), - .irq_lp = 0x2B, /* Level 5 and Priority 3 */ - .par_val = SPI_PAR_VAL, - .cs_control = coldfire_qspi_cs_control, -}; - -static struct resource coldfire_spi_resources[] = { - [0] = { - .name = "qspi-par", - .start = MCF5282_QSPI_PAR, - .end = MCF5282_QSPI_PAR, - .flags = IORESOURCE_MEM - }, - - [1] = { - .name = "qspi-module", - .start = MCF5282_QSPI_QMR, - .end = MCF5282_QSPI_QMR + 0x18, - .flags = IORESOURCE_MEM - }, - - [2] = { - .name = "qspi-int-level", - .start = MCF5282_INTC0 + MCFINTC_ICR0 + MCF5282_QSPI_IRQ_SOURCE, - .end = MCF5282_INTC0 + MCFINTC_ICR0 + MCF5282_QSPI_IRQ_SOURCE, - .flags = IORESOURCE_MEM - }, - - [3] = { - .name = "qspi-int-mask", - .start = MCF5282_INTC0 + MCFINTC_IMRL, - .end = MCF5282_INTC0 + MCFINTC_IMRL, - .flags = IORESOURCE_MEM - } -}; - -static struct platform_device coldfire_spi = { - .name = "spi_coldfire", - .id = -1, - .resource = coldfire_spi_resources, - .num_resources = ARRAY_SIZE(coldfire_spi_resources), - .dev = { - .platform_data = &coldfire_master_info, - } -}; - -static void coldfire_qspi_cs_control(u8 cs, u8 command) -{ - u8 cs_bit = ((0x01 << cs) << 3) & SPI_CS_MASK; - -#if defined(CONFIG_WILDFIRE) - u8 cs_mask = ~(((0x01 << cs) << 3) & SPI_CS_MASK); -#endif -#if defined(CONFIG_WILDFIREMOD) - u8 cs_mask = (cs << 3) & SPI_CS_MASK; -#endif - - /* - * Don't do anything if the chip select is not - * one of the port qs pins. - */ - if (command & QSPI_CS_INIT) { -#if defined(CONFIG_WILDFIRE) - MCF5282_GPIO_DDRQS |= cs_bit; - MCF5282_GPIO_PQSPAR &= ~cs_bit; -#endif - -#if defined(CONFIG_WILDFIREMOD) - MCF5282_GPIO_DDRQS |= SPI_CS_MASK; - MCF5282_GPIO_PQSPAR &= ~SPI_CS_MASK; -#endif - } - - if (command & QSPI_CS_ASSERT) { - MCF5282_GPIO_PORTQS &= ~SPI_CS_MASK; - MCF5282_GPIO_PORTQS |= cs_mask; - } else if (command & QSPI_CS_DROP) { - MCF5282_GPIO_PORTQS |= SPI_CS_MASK; - } -} - -static int __init spi_dev_init(void) -{ - int retval; - - retval = platform_device_register(&coldfire_spi); - if (retval < 0) - return retval; - - if (ARRAY_SIZE(spi_board_info)) - retval = spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); - - return retval; -} - -#endif /* CONFIG_SPI */ /***************************************************************************/ diff --git a/trunk/arch/sh/boards/board-ap325rxa.c b/trunk/arch/sh/boards/board-ap325rxa.c index 72da416f6162..15b6d450fbf0 100644 --- a/trunk/arch/sh/boards/board-ap325rxa.c +++ b/trunk/arch/sh/boards/board-ap325rxa.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include