packages: kernel/kernel-tuxonice.patch - tuxonice patch from 2011-07-12
draenog
draenog at pld-linux.org
Tue Jul 12 01:37:22 CEST 2011
Author: draenog Date: Mon Jul 11 23:37:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- tuxonice patch from 2011-07-12
---- Files affected:
packages/kernel:
kernel-tuxonice.patch (1.27 -> 1.28)
---- Diffs:
================================================================
Index: packages/kernel/kernel-tuxonice.patch
diff -u packages/kernel/kernel-tuxonice.patch:1.27 packages/kernel/kernel-tuxonice.patch:1.28
--- packages/kernel/kernel-tuxonice.patch:1.27 Mon Jul 11 23:58:56 2011
+++ packages/kernel/kernel-tuxonice.patch Tue Jul 12 01:37:16 2011
@@ -1,8 +1,114 @@
+diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle
+index 58b0bf9..fa6e25b 100644
+--- a/Documentation/CodingStyle
++++ b/Documentation/CodingStyle
+@@ -680,8 +680,8 @@ ones already enabled by DEBUG.
+ Chapter 14: Allocating memory
+
+ The kernel provides the following general purpose memory allocators:
+-kmalloc(), kzalloc(), kcalloc(), and vmalloc(). Please refer to the API
+-documentation for further information about them.
++kmalloc(), kzalloc(), kcalloc(), vmalloc(), and vzalloc(). Please refer to
++the API documentation for further information about them.
+
+ The preferred form for passing a size of a struct is the following:
+
+diff --git a/Documentation/cgroups/blkio-controller.txt b/Documentation/cgroups/blkio-controller.txt
+index cd45c8e..84f0a15 100644
+--- a/Documentation/cgroups/blkio-controller.txt
++++ b/Documentation/cgroups/blkio-controller.txt
+@@ -77,7 +77,7 @@ Throttling/Upper Limit policy
+ - Specify a bandwidth rate on particular device for root group. The format
+ for policy is "<major>:<minor> <byes_per_second>".
+
+- echo "8:16 1048576" > /sys/fs/cgroup/blkio/blkio.read_bps_device
++ echo "8:16 1048576" > /sys/fs/cgroup/blkio/blkio.throttle.read_bps_device
+
+ Above will put a limit of 1MB/second on reads happening for root group
+ on device having major/minor number 8:16.
+@@ -90,7 +90,7 @@ Throttling/Upper Limit policy
+ 1024+0 records out
+ 4194304 bytes (4.2 MB) copied, 4.0001 s, 1.0 MB/s
+
+- Limits for writes can be put using blkio.write_bps_device file.
++ Limits for writes can be put using blkio.throttle.write_bps_device file.
+
+ Hierarchical Cgroups
+ ====================
+@@ -286,28 +286,28 @@ Throttling/Upper limit policy files
+ specified in bytes per second. Rules are per deivce. Following is
+ the format.
+
+- echo "<major>:<minor> <rate_bytes_per_second>" > /cgrp/blkio.read_bps_device
++ echo "<major>:<minor> <rate_bytes_per_second>" > /cgrp/blkio.throttle.read_bps_device
+
+ - blkio.throttle.write_bps_device
+ - Specifies upper limit on WRITE rate to the device. IO rate is
+ specified in bytes per second. Rules are per deivce. Following is
+ the format.
+
+- echo "<major>:<minor> <rate_bytes_per_second>" > /cgrp/blkio.write_bps_device
++ echo "<major>:<minor> <rate_bytes_per_second>" > /cgrp/blkio.throttle.write_bps_device
+
+ - blkio.throttle.read_iops_device
+ - Specifies upper limit on READ rate from the device. IO rate is
+ specified in IO per second. Rules are per deivce. Following is
+ the format.
+
+- echo "<major>:<minor> <rate_io_per_second>" > /cgrp/blkio.read_iops_device
++ echo "<major>:<minor> <rate_io_per_second>" > /cgrp/blkio.throttle.read_iops_device
+
+ - blkio.throttle.write_iops_device
+ - Specifies upper limit on WRITE rate to the device. IO rate is
+ specified in io per second. Rules are per deivce. Following is
+ the format.
+
+- echo "<major>:<minor> <rate_io_per_second>" > /cgrp/blkio.write_iops_device
++ echo "<major>:<minor> <rate_io_per_second>" > /cgrp/blkio.throttle.write_iops_device
+
+ Note: If both BW and IOPS rules are specified for a device, then IO is
+ subjectd to both the constraints.
+diff --git a/Documentation/filesystems/caching/netfs-api.txt b/Documentation/filesystems/caching/netfs-api.txt
+index a167ab8..7cc6bf2 100644
+--- a/Documentation/filesystems/caching/netfs-api.txt
++++ b/Documentation/filesystems/caching/netfs-api.txt
+@@ -673,6 +673,22 @@ storage request to complete, or it may attempt to cancel the storage request -
+ in which case the page will not be stored in the cache this time.
+
+
++BULK INODE PAGE UNCACHE
++-----------------------
++
++A convenience routine is provided to perform an uncache on all the pages
++attached to an inode. This assumes that the pages on the inode correspond on a
++1:1 basis with the pages in the cache.
++
++ void fscache_uncache_all_inode_pages(struct fscache_cookie *cookie,
++ struct inode *inode);
++
++This takes the netfs cookie that the pages were cached with and the inode that
++the pages are attached to. This function will wait for pages to finish being
++written to the cache and for the cache to finish with the page generally. No
++error is returned.
++
++
+ ==========================
+ INDEX AND DATA FILE UPDATE
+ ==========================
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index f4a04c0..4899ec8 100644
+index fd248a31..bc13362 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -2577,6 +2577,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -2015,6 +2015,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+ the default.
+ off: Turn ECRC off
+ on: Turn ECRC on.
++ realloc reallocate PCI resources if allocations done by BIOS
++ are erroneous.
+
+ pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
+ Management.
+@@ -2617,6 +2619,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
HIGHMEM regardless of setting
of CONFIG_HIGHPTE.
@@ -1450,10 +1556,45 @@
+ testing. His efforts have contributed as much to TuxOnIce as any of the
+ names above.
diff --git a/MAINTAINERS b/MAINTAINERS
-index f1bc3dc..04365d6 100644
+index ae563fa..f8394c2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -6208,6 +6208,13 @@ S: Maintained
+@@ -594,6 +594,16 @@ S: Maintained
+ F: arch/arm/lib/floppydma.S
+ F: arch/arm/include/asm/floppy.h
+
++ARM PMU PROFILING AND DEBUGGING
++M: Will Deacon <will.deacon at arm.com>
++S: Maintained
++F: arch/arm/kernel/perf_event*
++F: arch/arm/oprofile/common.c
++F: arch/arm/kernel/pmu.c
++F: arch/arm/include/asm/pmu.h
++F: arch/arm/kernel/hw_breakpoint.c
++F: arch/arm/include/asm/hw_breakpoint.h
++
+ ARM PORT
+ M: Russell King <linux at arm.linux.org.uk>
+ L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
+@@ -2197,7 +2207,7 @@ F: drivers/acpi/dock.c
+ DOCUMENTATION
+ M: Randy Dunlap <rdunlap at xenotime.net>
+ L: linux-doc at vger.kernel.org
+-T: quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/
++T: quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/
+ S: Maintained
+ F: Documentation/
+
+@@ -4982,7 +4992,7 @@ F: drivers/power/power_supply*
+
+ PNP SUPPORT
+ M: Adam Belay <abelay at mit.edu>
+-M: Bjorn Helgaas <bjorn.helgaas at hp.com>
++M: Bjorn Helgaas <bhelgaas at google.com>
+ S: Maintained
+ F: drivers/pnp/
+
+@@ -6303,6 +6313,13 @@ S: Maintained
F: drivers/tc/
F: include/linux/tc.h
@@ -1467,11 +1608,736 @@
U14-34F SCSI DRIVER
M: Dario Ballabio <ballabio_dario at emc.com>
L: linux-scsi at vger.kernel.org
+@@ -6733,6 +6750,7 @@ F: fs/fat/
+ VIDEOBUF2 FRAMEWORK
+ M: Pawel Osciak <pawel at osciak.com>
+ M: Marek Szyprowski <m.szyprowski at samsung.com>
++M: Kyungmin Park <kyungmin.park at samsung.com>
+ L: linux-media at vger.kernel.org
+ S: Maintained
+ F: drivers/media/video/videobuf2-*
+diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
+index e568163..841df7d 100644
+--- a/arch/arm/common/dmabounce.c
++++ b/arch/arm/common/dmabounce.c
+@@ -255,7 +255,7 @@ static inline dma_addr_t map_single(struct device *dev, void *ptr, size_t size,
+ if (buf == 0) {
+ dev_err(dev, "%s: unable to map unsafe buffer %p!\n",
+ __func__, ptr);
+- return 0;
++ return ~0;
+ }
+
+ dev_dbg(dev,
+diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
+index d53c0ab..2b5b142 100644
+--- a/arch/arm/kernel/perf_event.c
++++ b/arch/arm/kernel/perf_event.c
+@@ -583,7 +583,7 @@ static int armpmu_event_init(struct perf_event *event)
+ static void armpmu_enable(struct pmu *pmu)
+ {
+ /* Enable all of the perf events on hardware. */
+- int idx;
++ int idx, enabled = 0;
+ struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+
+ if (!armpmu)
+@@ -596,9 +596,11 @@ static void armpmu_enable(struct pmu *pmu)
+ continue;
+
+ armpmu->enable(&event->hw, idx);
++ enabled = 1;
+ }
+
+- armpmu->start();
++ if (enabled)
++ armpmu->start();
+ }
+
+ static void armpmu_disable(struct pmu *pmu)
+diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
+index ed11fb0..acbb447 100644
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -73,6 +73,7 @@ __setup("fpe=", fpe_setup);
+ #endif
+
+ extern void paging_init(struct machine_desc *desc);
++extern void sanity_check_meminfo(void);
+ extern void reboot_setup(char *str);
+
+ unsigned int processor_id;
+@@ -900,6 +901,7 @@ void __init setup_arch(char **cmdline_p)
+
+ parse_early_param();
+
++ sanity_check_meminfo();
+ arm_memblock_init(&meminfo, mdesc);
+
+ paging_init(mdesc);
+diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
+index 60636f4..2c277d4 100644
+--- a/arch/arm/kernel/smp_twd.c
++++ b/arch/arm/kernel/smp_twd.c
+@@ -115,7 +115,7 @@ static void __cpuinit twd_calibrate_rate(void)
+ twd_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5);
+
+ printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
+- (twd_timer_rate / 1000000) % 100);
++ (twd_timer_rate / 10000) % 100);
+ }
+ }
+
+diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
+index 1d4b65f..6659a0d 100644
+--- a/arch/arm/mach-ep93xx/core.c
++++ b/arch/arm/mach-ep93xx/core.c
+@@ -251,9 +251,9 @@ static void ep93xx_uart_set_mctrl(struct amba_device *dev,
+ unsigned int mcr;
+
+ mcr = 0;
+- if (!(mctrl & TIOCM_RTS))
++ if (mctrl & TIOCM_RTS)
+ mcr |= 2;
+- if (!(mctrl & TIOCM_DTR))
++ if (mctrl & TIOCM_DTR)
+ mcr |= 1;
+
+ __raw_writel(mcr, base + EP93XX_UART_MCR_OFFSET);
+diff --git a/arch/arm/mach-exynos4/cpu.c b/arch/arm/mach-exynos4/cpu.c
+index 9babe44..bfd6214 100644
+--- a/arch/arm/mach-exynos4/cpu.c
++++ b/arch/arm/mach-exynos4/cpu.c
+@@ -23,6 +23,7 @@
+ #include <plat/sdhci.h>
+ #include <plat/devs.h>
+ #include <plat/fimc-core.h>
++#include <plat/iic-core.h>
+
+ #include <mach/regs-irq.h>
+
+@@ -132,6 +133,11 @@ void __init exynos4_map_io(void)
+ s3c_fimc_setname(1, "exynos4-fimc");
+ s3c_fimc_setname(2, "exynos4-fimc");
+ s3c_fimc_setname(3, "exynos4-fimc");
++
++ /* The I2C bus controllers are directly compatible with s3c2440 */
++ s3c_i2c0_setname("s3c2440-i2c");
++ s3c_i2c1_setname("s3c2440-i2c");
++ s3c_i2c2_setname("s3c2440-i2c");
+ }
+
+ void __init exynos4_init_clocks(int xtal)
+diff --git a/arch/arm/mach-exynos4/dev-audio.c b/arch/arm/mach-exynos4/dev-audio.c
+index 1eed5f9..983069a 100644
+--- a/arch/arm/mach-exynos4/dev-audio.c
++++ b/arch/arm/mach-exynos4/dev-audio.c
+@@ -330,7 +330,7 @@ struct platform_device exynos4_device_ac97 = {
+
+ static int exynos4_spdif_cfg_gpio(struct platform_device *pdev)
+ {
+- s3c_gpio_cfgpin_range(EXYNOS4_GPC1(0), 2, S3C_GPIO_SFN(3));
++ s3c_gpio_cfgpin_range(EXYNOS4_GPC1(0), 2, S3C_GPIO_SFN(4));
+
+ return 0;
+ }
+diff --git a/arch/arm/mach-exynos4/headsmp.S b/arch/arm/mach-exynos4/headsmp.S
+index 6c6cfc5..3cdeb36 100644
+--- a/arch/arm/mach-exynos4/headsmp.S
++++ b/arch/arm/mach-exynos4/headsmp.S
+@@ -13,7 +13,7 @@
+ #include <linux/linkage.h>
+ #include <linux/init.h>
+
+- __INIT
++ __CPUINIT
+
+ /*
+ * exynos4 specific entry point for secondary CPUs. This provides
+diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c b/arch/arm/mach-exynos4/mach-smdkv310.c
+index 1526764..edd8141 100644
+--- a/arch/arm/mach-exynos4/mach-smdkv310.c
++++ b/arch/arm/mach-exynos4/mach-smdkv310.c
+@@ -78,9 +78,7 @@ static struct s3c2410_uartcfg smdkv310_uartcfgs[] __initdata = {
+ };
+
+ static struct s3c_sdhci_platdata smdkv310_hsmmc0_pdata __initdata = {
+- .cd_type = S3C_SDHCI_CD_GPIO,
+- .ext_cd_gpio = EXYNOS4_GPK0(2),
+- .ext_cd_gpio_invert = 1,
++ .cd_type = S3C_SDHCI_CD_INTERNAL,
+ .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
+ #ifdef CONFIG_EXYNOS4_SDHCI_CH0_8BIT
+ .max_width = 8,
+@@ -96,9 +94,7 @@ static struct s3c_sdhci_platdata smdkv310_hsmmc1_pdata __initdata = {
+ };
+
+ static struct s3c_sdhci_platdata smdkv310_hsmmc2_pdata __initdata = {
+- .cd_type = S3C_SDHCI_CD_GPIO,
+- .ext_cd_gpio = EXYNOS4_GPK2(2),
+- .ext_cd_gpio_invert = 1,
++ .cd_type = S3C_SDHCI_CD_INTERNAL,
+ .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
+ #ifdef CONFIG_EXYNOS4_SDHCI_CH2_8BIT
+ .max_width = 8,
+diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
+index de88c92..f49ce85 100644
+--- a/arch/arm/mach-omap1/board-ams-delta.c
++++ b/arch/arm/mach-omap1/board-ams-delta.c
+@@ -215,7 +215,7 @@ static struct omap_kp_platform_data ams_delta_kp_data __initdata = {
+ .delay = 9,
+ };
+
+-static struct platform_device ams_delta_kp_device __initdata = {
++static struct platform_device ams_delta_kp_device = {
+ .name = "omap-keypad",
+ .id = -1,
+ .dev = {
+@@ -225,12 +225,12 @@ static struct platform_device ams_delta_kp_device __initdata = {
+ .resource = ams_delta_kp_resources,
+ };
+
+-static struct platform_device ams_delta_lcd_device __initdata = {
++static struct platform_device ams_delta_lcd_device = {
+ .name = "lcd_ams_delta",
+ .id = -1,
+ };
+
+-static struct platform_device ams_delta_led_device __initdata = {
++static struct platform_device ams_delta_led_device = {
+ .name = "ams-delta-led",
+ .id = -1
+ };
+@@ -267,7 +267,7 @@ static struct soc_camera_link ams_delta_iclink = {
+ .power = ams_delta_camera_power,
+ };
+
+-static struct platform_device ams_delta_camera_device __initdata = {
++static struct platform_device ams_delta_camera_device = {
+ .name = "soc-camera-pdrv",
+ .id = 0,
+ .dev = {
+diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c
+index 04c4b04..364137c 100644
+--- a/arch/arm/mach-omap1/gpio15xx.c
++++ b/arch/arm/mach-omap1/gpio15xx.c
+@@ -41,7 +41,7 @@ static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = {
+ .bank_stride = 1,
+ };
+
+-static struct __initdata platform_device omap15xx_mpu_gpio = {
++static struct platform_device omap15xx_mpu_gpio = {
+ .name = "omap_gpio",
+ .id = 0,
+ .dev = {
+@@ -70,7 +70,7 @@ static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = {
+ .bank_width = 16,
+ };
+
+-static struct __initdata platform_device omap15xx_gpio = {
++static struct platform_device omap15xx_gpio = {
+ .name = "omap_gpio",
+ .id = 1,
+ .dev = {
+diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c
+index 5dd0d4c..293a246 100644
+--- a/arch/arm/mach-omap1/gpio16xx.c
++++ b/arch/arm/mach-omap1/gpio16xx.c
+@@ -44,7 +44,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = {
+ .bank_stride = 1,
+ };
+
+-static struct __initdata platform_device omap16xx_mpu_gpio = {
++static struct platform_device omap16xx_mpu_gpio = {
+ .name = "omap_gpio",
+ .id = 0,
+ .dev = {
+@@ -73,7 +73,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = {
+ .bank_width = 16,
+ };
+
+-static struct __initdata platform_device omap16xx_gpio1 = {
++static struct platform_device omap16xx_gpio1 = {
+ .name = "omap_gpio",
+ .id = 1,
+ .dev = {
+@@ -102,7 +102,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = {
+ .bank_width = 16,
+ };
+
+-static struct __initdata platform_device omap16xx_gpio2 = {
++static struct platform_device omap16xx_gpio2 = {
+ .name = "omap_gpio",
+ .id = 2,
+ .dev = {
+@@ -131,7 +131,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = {
+ .bank_width = 16,
+ };
+
+-static struct __initdata platform_device omap16xx_gpio3 = {
++static struct platform_device omap16xx_gpio3 = {
+ .name = "omap_gpio",
+ .id = 3,
+ .dev = {
+@@ -160,7 +160,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = {
+ .bank_width = 16,
+ };
+
+-static struct __initdata platform_device omap16xx_gpio4 = {
++static struct platform_device omap16xx_gpio4 = {
+ .name = "omap_gpio",
+ .id = 4,
+ .dev = {
+diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c
+index 1204c8b..c6ad248 100644
+--- a/arch/arm/mach-omap1/gpio7xx.c
++++ b/arch/arm/mach-omap1/gpio7xx.c
+@@ -46,7 +46,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = {
+ .bank_stride = 2,
+ };
+
+-static struct __initdata platform_device omap7xx_mpu_gpio = {
++static struct platform_device omap7xx_mpu_gpio = {
+ .name = "omap_gpio",
+ .id = 0,
+ .dev = {
+@@ -75,7 +75,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = {
+ .bank_width = 32,
+ };
+
+-static struct __initdata platform_device omap7xx_gpio1 = {
++static struct platform_device omap7xx_gpio1 = {
+ .name = "omap_gpio",
+ .id = 1,
+ .dev = {
+@@ -104,7 +104,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = {
+ .bank_width = 32,
+ };
+
+-static struct __initdata platform_device omap7xx_gpio2 = {
++static struct platform_device omap7xx_gpio2 = {
+ .name = "omap_gpio",
+ .id = 2,
+ .dev = {
+@@ -133,7 +133,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = {
+ .bank_width = 32,
+ };
+
+-static struct __initdata platform_device omap7xx_gpio3 = {
++static struct platform_device omap7xx_gpio3 = {
+ .name = "omap_gpio",
+ .id = 3,
+ .dev = {
+@@ -162,7 +162,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = {
+ .bank_width = 32,
+ };
+
+-static struct __initdata platform_device omap7xx_gpio4 = {
++static struct platform_device omap7xx_gpio4 = {
+ .name = "omap_gpio",
+ .id = 4,
+ .dev = {
+@@ -191,7 +191,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = {
+ .bank_width = 32,
+ };
+
+-static struct __initdata platform_device omap7xx_gpio5 = {
++static struct platform_device omap7xx_gpio5 = {
+ .name = "omap_gpio",
+ .id = 5,
+ .dev = {
+@@ -220,7 +220,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = {
+ .bank_width = 32,
+ };
+
+-static struct __initdata platform_device omap7xx_gpio6 = {
++static struct platform_device omap7xx_gpio6 = {
+ .name = "omap_gpio",
+ .id = 6,
+ .dev = {
+diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
+index 9903667..88bd6f7 100644
+--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
++++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
+@@ -558,7 +558,7 @@ static struct radio_si4713_platform_data rx51_si4713_data __initdata_or_module =
+ .subdev_board_info = &rx51_si4713_board_info,
+ };
+
+-static struct platform_device rx51_si4713_dev __initdata_or_module = {
++static struct platform_device rx51_si4713_dev = {
+ .name = "radio-si4713",
+ .id = -1,
+ .dev = {
+diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
+index dd3120d..fc2dc0b 100644
+--- a/arch/arm/mach-s3c2440/mach-mini2440.c
++++ b/arch/arm/mach-s3c2440/mach-mini2440.c
+@@ -552,7 +552,7 @@ struct mini2440_features_t {
+ struct platform_device *optional[8];
+ };
+
+-static void mini2440_parse_features(
++static void __init mini2440_parse_features(
+ struct mini2440_features_t * features,
+ const char * features_str )
+ {
+diff --git a/arch/arm/mach-s3c64xx/dev-spi.c b/arch/arm/mach-s3c64xx/dev-spi.c
+index 82db072..5e6b420 100644
+--- a/arch/arm/mach-s3c64xx/dev-spi.c
++++ b/arch/arm/mach-s3c64xx/dev-spi.c
+@@ -88,6 +88,7 @@ static struct s3c64xx_spi_info s3c64xx_spi0_pdata = {
+ .cfg_gpio = s3c64xx_spi_cfg_gpio,
+ .fifo_lvl_mask = 0x7f,
+ .rx_lvl_offset = 13,
++ .tx_st_done = 21,
+ };
+
+ static u64 spi_dmamask = DMA_BIT_MASK(32);
+@@ -132,6 +133,7 @@ static struct s3c64xx_spi_info s3c64xx_spi1_pdata = {
+ .cfg_gpio = s3c64xx_spi_cfg_gpio,
+ .fifo_lvl_mask = 0x7f,
+ .rx_lvl_offset = 13,
++ .tx_st_done = 21,
+ };
+
+ struct platform_device s3c64xx_device_spi1 = {
+diff --git a/arch/arm/mach-s5p64x0/dev-spi.c b/arch/arm/mach-s5p64x0/dev-spi.c
+index e78ee18..ac825e8 100644
+--- a/arch/arm/mach-s5p64x0/dev-spi.c
++++ b/arch/arm/mach-s5p64x0/dev-spi.c
+@@ -112,12 +112,14 @@ static struct s3c64xx_spi_info s5p6440_spi0_pdata = {
+ .cfg_gpio = s5p6440_spi_cfg_gpio,
+ .fifo_lvl_mask = 0x1ff,
+ .rx_lvl_offset = 15,
++ .tx_st_done = 25,
+ };
+
+ static struct s3c64xx_spi_info s5p6450_spi0_pdata = {
+ .cfg_gpio = s5p6450_spi_cfg_gpio,
+ .fifo_lvl_mask = 0x1ff,
+ .rx_lvl_offset = 15,
++ .tx_st_done = 25,
+ };
+
+ static u64 spi_dmamask = DMA_BIT_MASK(32);
+@@ -160,12 +162,14 @@ static struct s3c64xx_spi_info s5p6440_spi1_pdata = {
+ .cfg_gpio = s5p6440_spi_cfg_gpio,
+ .fifo_lvl_mask = 0x7f,
+ .rx_lvl_offset = 15,
++ .tx_st_done = 25,
+ };
+
+ static struct s3c64xx_spi_info s5p6450_spi1_pdata = {
+ .cfg_gpio = s5p6450_spi_cfg_gpio,
+ .fifo_lvl_mask = 0x7f,
+ .rx_lvl_offset = 15,
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-tuxonice.patch?r1=1.27&r2=1.28&f=u
More information about the pld-cvs-commit
mailing list