---

yaml
---
r: 33323
b: refs/heads/master
c: c723e08
h: refs/heads/master
i:
  33321: 39816c5
  33319: 8092523
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8872f4cb4b58f06a27d0443668d12d49f3b5d31
+refs/heads/master: c723e08af18e60cda3bbc90e0d6fb688587aeb9f

trunk/Documentation/sysctl/kernel.txt

@@ -211,8 +211,9 @@ Controls the kernel's behaviour when an oops or BUG is encountered.
 
 0: try to continue operation
 
-1: panic immediatly.  If the `panic' sysctl is also non-zero then the
-   machine will be rebooted.
+1: delay a few seconds (to give klogd time to record the oops output) and
+   then panic.  If the `panic' sysctl is also non-zero then the machine will
+   be rebooted.
 
 ==============================================================
 

trunk/MAINTAINERS

@@ -298,13 +298,6 @@ L:	info-linux@geode.amd.com
 W:	http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:	Supported
 
-AOA (Apple Onboard Audio) ALSA DRIVER
-P:	Johannes Berg
-M:	johannes@sipsolutions.net
-L:	linuxppc-dev@ozlabs.org
-L:	alsa-devel@alsa-project.org
-S:	Maintained
-
 APM DRIVER
 P:	Stephen Rothwell
 M:	sfr@canb.auug.org.au
@@ -2648,14 +2641,6 @@ M:	dbrownell@users.sourceforge.net
 L:	spi-devel-general@lists.sourceforge.net
 S:	Maintained
 
-STABLE BRANCH:
-P:	Greg Kroah-Hartman
-M:	greg@kroah.com
-P:	Chris Wright
-M:	chrisw@sous-sol.org
-L:	stable@kernel.org
-S:	Maintained
-
 TPM DEVICE DRIVER
 P:	Kylene Hall
 M:	kjhall@us.ibm.com

trunk/Makefile

@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 18
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc3
 NAME=Crazed Snow-Weasel
 
 # *DOCUMENTATION*
@@ -436,13 +436,12 @@ core-y		:= usr/
 endif # KBUILD_EXTMOD
 
 ifeq ($(dot-config),1)
-# Read in config
--include include/config/auto.conf
+# In this section, we need .config
 
-ifeq ($(KBUILD_EXTMOD),)
 # Read in dependencies to all Kconfig* files, make sure to run
 # oldconfig if changes are detected.
 -include include/config/auto.conf.cmd
+-include include/config/auto.conf
 
 # To avoid any implicit rule to kick in, define an empty command
 $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
@@ -452,27 +451,16 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
 # if auto.conf.cmd is missing then we are probably in a cleaned tree so
 # we execute the config step to be sure to catch updated Kconfig files
 include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
+ifeq ($(KBUILD_EXTMOD),)
 	$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
 else
-# external modules needs include/linux/autoconf.h and include/config/auto.conf
-# but do not care if they are up-to-date. Use auto.conf to trigger the test
-PHONY += include/config/auto.conf
-
-include/config/auto.conf:
-	$(Q)test -e include/linux/autoconf.h -a -e $@ || (		\
-	echo;								\
-	echo "  ERROR: Kernel configuration is invalid.";		\
-	echo "         include/linux/autoconf.h or $@ are missing.";	\
-	echo "         Run 'make oldconfig && make prepare' on kernel src to fix it.";	\
-	echo;								\
-	/bin/false)
-
-endif # KBUILD_EXTMOD
+	$(error kernel configuration not valid - run 'make prepare' in $(srctree) to update it)
+endif
 
 else
 # Dummy target needed, because used as prerequisite
 include/config/auto.conf: ;
-endif # $(dot-config)
+endif
 
 # The all: target is the default when no target is given on the
 # command line.

trunk/arch/arm/common/rtctime.c

@@ -68,7 +68,6 @@ void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, struct rtc
 		rtc_time_to_tm(next_time, next);
 	}
 }
-EXPORT_SYMBOL(rtc_next_alarm_time);
 
 static inline int rtc_arm_read_time(struct rtc_ops *ops, struct rtc_time *tm)
 {

trunk/arch/arm/mach-ixp4xx/common-pci.c

@@ -532,6 +532,8 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
 	return -EIO;
 }
 
+EXPORT_SYMBOL(pci_set_dma_mask);
+EXPORT_SYMBOL(pci_set_consistent_dma_mask);
 EXPORT_SYMBOL(ixp4xx_pci_read);
 EXPORT_SYMBOL(ixp4xx_pci_write);
 

trunk/arch/arm/mach-ixp4xx/gtwx5715-setup.c

@@ -107,9 +107,9 @@ static struct flash_platform_data gtwx5715_flash_data = {
 	.width		= 2,
 };
 
-static struct resource gtwx5715_flash_resource = {
+static struct gtw5715_flash_resource = {
 	.flags		= IORESOURCE_MEM,
-};
+}
 
 static struct platform_device gtwx5715_flash = {
 	.name		= "IXP4XX-Flash",
@@ -130,6 +130,9 @@ static void __init gtwx5715_init(void)
 {
 	ixp4xx_sys_init();
 
+	if (!flash_resource)
+		printk(KERN_ERR "Could not allocate flash resource\n");
+
 	gtwx5715_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
 	gtwx5715_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_8M - 1;
 

trunk/arch/sh/kernel/cpu/sh4/sq.c

@@ -421,22 +421,18 @@ static struct miscdevice sq_dev = {
 
 static int __init sq_api_init(void)
 {
-	int ret;
 	printk(KERN_NOTICE "sq: Registering store queue API.\n");
 
+#ifdef CONFIG_PROC_FS
 	create_proc_read_entry("sq_mapping", 0, 0, sq_mapping_read_proc, 0);
+#endif
 
-	ret = misc_register(&sq_dev);
-	if (ret)
-		remove_proc_entry("sq_mapping", NULL);
-
-	return ret;
+	return misc_register(&sq_dev);
 }
 
 static void __exit sq_api_exit(void)
 {
 	misc_deregister(&sq_dev);
-	remove_proc_entry("sq_mapping", NULL);
 }
 
 module_init(sq_api_init);

trunk/arch/x86_64/kernel/smp.c

@@ -203,7 +203,7 @@ int __cpuinit init_smp_flush(void)
 {
 	int i;
 	for_each_cpu_mask(i, cpu_possible_map) {
-		spin_lock_init(&per_cpu(flush_state, i).tlbstate_lock);
+		spin_lock_init(&per_cpu(flush_state.tlbstate_lock, i));
 	}
 	return 0;
 }

trunk/drivers/acpi/acpi_memhotplug.c

@@ -129,15 +129,11 @@ acpi_memory_get_device_resources(struct acpi_memory_device *mem_device)
 	struct acpi_memory_info *info, *n;
 
 
-	if (!list_empty(&mem_device->res_list))
-		return 0;
-
 	status = acpi_walk_resources(mem_device->device->handle, METHOD_NAME__CRS,
 				     acpi_memory_get_resource, mem_device);
 	if (ACPI_FAILURE(status)) {
 		list_for_each_entry_safe(info, n, &mem_device->res_list, list)
 			kfree(info);
-		INIT_LIST_HEAD(&mem_device->res_list);
 		return -EINVAL;
 	}
 
@@ -234,10 +230,17 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
 	 * (i.e. memory-hot-remove function)
 	 */
 	list_for_each_entry(info, &mem_device->res_list, list) {
-		if (info->enabled) { /* just sanity check...*/
+		u64 start_pfn, end_pfn;
+
+		start_pfn = info->start_addr >> PAGE_SHIFT;
+		end_pfn = (info->start_addr + info->length - 1) >> PAGE_SHIFT;
+
+		if (pfn_valid(start_pfn) || pfn_valid(end_pfn)) {
+			/* already enabled. try next area */
 			num_enabled++;
 			continue;
 		}
+
 		result = add_memory(node, info->start_addr, info->length);
 		if (result)
 			continue;

trunk/drivers/char/hvsi.c

@@ -311,8 +311,7 @@ static void hvsi_recv_control(struct hvsi_struct *hp, uint8_t *packet,
 				/* CD went away; no more connection */
 				pr_debug("hvsi%i: CD dropped\n", hp->index);
 				hp->mctrl &= TIOCM_CD;
-				/* If userland hasn't done an open(2) yet, hp->tty is NULL. */
-				if (hp->tty && !(hp->tty->flags & CLOCAL))
+				if (!(hp->tty->flags & CLOCAL))
 					*to_hangup = hp->tty;
 			}
 			break;
@@ -987,7 +986,10 @@ static void hvsi_write_worker(void *arg)
 		start_j = 0;
 #endif /* DEBUG */
 		wake_up_all(&hp->emptyq);
-		tty_wakeup(hp->tty);
+		if (test_bit(TTY_DO_WRITE_WAKEUP, &hp->tty->flags)
+				&& hp->tty->ldisc.write_wakeup)
+			hp->tty->ldisc.write_wakeup(hp->tty);
+		wake_up_interruptible(&hp->tty->write_wait);
 	}
 
 out:

trunk/drivers/char/hw_random/omap-rng.c

@@ -25,12 +25,12 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/random.h>
-#include <linux/clk.h>
 #include <linux/err.h>
-#include <linux/platform_device.h>
+#include <linux/device.h>
 #include <linux/hw_random.h>
 
 #include <asm/io.h>
+#include <asm/hardware/clock.h>
 
 #define RNG_OUT_REG		0x00		/* Output register */
 #define RNG_STAT_REG		0x04		/* Status register
@@ -52,7 +52,7 @@
 
 static void __iomem *rng_base;
 static struct clk *rng_ick;
-static struct platform_device *rng_dev;
+static struct device *rng_dev;
 
 static u32 omap_rng_read_reg(int reg)
 {
@@ -83,8 +83,9 @@ static struct hwrng omap_rng_ops = {
 	.data_read	= omap_rng_data_read,
 };
 
-static int __init omap_rng_probe(struct platform_device *pdev)
+static int __init omap_rng_probe(struct device *dev)
 {
+	struct platform_device *pdev = to_platform_device(dev);
 	struct resource *res, *mem;
 	int ret;
 
@@ -94,14 +95,16 @@ static int __init omap_rng_probe(struct platform_device *pdev)
 	 */
 	BUG_ON(rng_dev);
 
-	if (cpu_is_omap24xx()) {
+    	if (cpu_is_omap24xx()) {
 		rng_ick = clk_get(NULL, "rng_ick");
 		if (IS_ERR(rng_ick)) {
-			dev_err(&pdev->dev, "Could not get rng_ick\n");
+			dev_err(dev, "Could not get rng_ick\n");
 			ret = PTR_ERR(rng_ick);
 			return ret;
-		} else
-			clk_enable(rng_ick);
+		}
+		else {
+			clk_use(rng_ick);
+		}
 	}
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -114,7 +117,7 @@ static int __init omap_rng_probe(struct platform_device *pdev)
 	if (mem == NULL)
 		return -EBUSY;
 
-	dev_set_drvdata(&pdev->dev, mem);
+	dev_set_drvdata(dev, mem);
 	rng_base = (u32 __iomem *)io_p2v(res->start);
 
 	ret = hwrng_register(&omap_rng_ops);
@@ -124,25 +127,25 @@ static int __init omap_rng_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	dev_info(&pdev->dev, "OMAP Random Number Generator ver. %02x\n",
+	dev_info(dev, "OMAP Random Number Generator ver. %02x\n",
 		omap_rng_read_reg(RNG_REV_REG));
 	omap_rng_write_reg(RNG_MASK_REG, 0x1);
 
-	rng_dev = pdev;
+	rng_dev = dev;
 
 	return 0;
 }
 
-static int __exit omap_rng_remove(struct platform_device *pdev)
+static int __exit omap_rng_remove(struct device *dev)
 {
-	struct resource *mem = dev_get_drvdata(&pdev->dev);
+	struct resource *mem = dev_get_drvdata(dev);
 
 	hwrng_unregister(&omap_rng_ops);
 
 	omap_rng_write_reg(RNG_MASK_REG, 0x0);
 
 	if (cpu_is_omap24xx()) {
-		clk_disable(rng_ick);
+		clk_unuse(rng_ick);
 		clk_put(rng_ick);
 	}
 
@@ -154,16 +157,18 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_PM
 
-static int omap_rng_suspend(struct platform_device *pdev, pm_message_t message)
+static int omap_rng_suspend(struct device *dev, pm_message_t message, u32 level)
 {
 	omap_rng_write_reg(RNG_MASK_REG, 0x0);
+
 	return 0;
 }
 
-static int omap_rng_resume(struct platform_device *pdev)
+static int omap_rng_resume(struct device *dev, pm_message_t message, u32 level)
 {
 	omap_rng_write_reg(RNG_MASK_REG, 0x1);
-	return 0;
+
+	return 1;
 }
 
 #else
@@ -174,11 +179,9 @@ static int omap_rng_resume(struct platform_device *pdev)
 #endif
 
 
-static struct platform_driver omap_rng_driver = {
-	.driver = {
-		.name		= "omap_rng",
-		.owner		= THIS_MODULE,
-	},
+static struct device_driver omap_rng_driver = {
+	.name		= "omap_rng",
+	.bus		= &platform_bus_type,
 	.probe		= omap_rng_probe,
 	.remove		= __exit_p(omap_rng_remove),
 	.suspend	= omap_rng_suspend,
@@ -190,12 +193,12 @@ static int __init omap_rng_init(void)
 	if (!cpu_is_omap16xx() && !cpu_is_omap24xx())
 		return -ENODEV;
 
-	return platform_driver_register(&omap_rng_driver);
+	return driver_register(&omap_rng_driver);
 }
 
 static void __exit omap_rng_exit(void)
 {
-	platform_driver_unregister(&omap_rng_driver);
+	driver_unregister(&omap_rng_driver);
 }
 
 module_init(omap_rng_init);