---

yaml
---
r: 4170
b: refs/heads/master
c: 8279dd7
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 960b8466548c9bc6f718b5f470c1a58000fab09d
+refs/heads/master: 8279dd748f9704b811e528b31304e2fab026abc5

trunk/arch/arm/kernel/armksyms.c

@@ -41,10 +41,7 @@ extern void fp_enter(void);
  * This has a special calling convention; it doesn't
  * modify any of the usual registers, except for LR.
  */
-#define EXPORT_CRC_ALIAS(sym) __CRC_SYMBOL(sym, "")
-
 #define EXPORT_SYMBOL_ALIAS(sym,orig)		\
- EXPORT_CRC_ALIAS(sym)				\
  const struct kernel_symbol __ksymtab_##sym	\
   __attribute__((section("__ksymtab"))) =	\
     { (unsigned long)&orig, #sym };

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

@@ -453,8 +453,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
 	local_write_config(PCI_COMMAND, 2, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
 
 	res[0].name = "PCI I/O Space";
-	res[0].start = 0x00000000;
-	res[0].end = 0x0000ffff;
+	res[0].start = 0x00001000;
+	res[0].end = 0xffff0000;
 	res[0].flags = IORESOURCE_IO;
 
 	res[1].name = "PCI Memory Space";

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

@@ -56,24 +56,21 @@ static struct resource coyote_uart_resource = {
 	.flags	= IORESOURCE_MEM,
 };
 
-static struct plat_serial8250_port coyote_uart_data[] = {
-	{
-		.mapbase	= IXP4XX_UART2_BASE_PHYS,
-		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-		.irq		= IRQ_IXP4XX_UART2,
-		.flags		= UPF_BOOT_AUTOCONF,
-		.iotype		= UPIO_MEM,
-		.regshift	= 2,
-		.uartclk	= IXP4XX_UART_XTAL,
-	},
-	{ },
+static struct plat_serial8250_port coyote_uart_data = {
+	.mapbase	= IXP4XX_UART2_BASE_PHYS,
+	.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
+	.irq		= IRQ_IXP4XX_UART2,
+	.flags		= UPF_BOOT_AUTOCONF,
+	.iotype		= UPIO_MEM,
+	.regshift	= 2,
+	.uartclk	= IXP4XX_UART_XTAL,
 };
 
 static struct platform_device coyote_uart = {
 	.name		= "serial8250",
 	.id		= 0,
 	.dev			= {
-		.platform_data	= coyote_uart_data,
+		.platform_data	= &coyote_uart_data,
 	},
 	.num_resources	= 1,
 	.resource	= &coyote_uart_resource,
@@ -90,10 +87,10 @@ static void __init coyote_init(void)
 	*IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
 
 	if (machine_is_ixdpg425()) {
-		coyote_uart_data[0].membase =
+		coyote_uart_data.membase =
 			(char*)(IXP4XX_UART1_BASE_VIRT + REG_OFFSET);
-		coyote_uart_data[0].mapbase = IXP4XX_UART1_BASE_PHYS;
-		coyote_uart_data[0].irq = IRQ_IXP4XX_UART1;
+		coyote_uart_data.mapbase = IXP4XX_UART1_BASE_PHYS;
+		coyote_uart_data.irq = IRQ_IXP4XX_UART1;
 	}
 
 

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

@@ -95,8 +95,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = {
 		.iotype		= UPIO_MEM,
 		.regshift	= 2,
 		.uartclk	= IXP4XX_UART_XTAL,
-	},
-	{ },
+	}
 };
 
 static struct platform_device ixdp425_uart = {

trunk/arch/arm/mm/proc-v6.S

@@ -200,7 +200,7 @@ __v6_setup:
 	mcr	p15, 0, r4, c2, c0, 1		@ load TTB1
 #ifdef CONFIG_VFP
 	mrc	p15, 0, r0, c1, c0, 2
-	orr	r0, r0, #(0xf << 20)
+	orr	r0, r0, #(3 << 20)
 	mcr	p15, 0, r0, c1, c0, 2		@ Enable full access to VFP
 #endif
 	mrc	p15, 0, r0, c1, c0, 0		@ read control register

trunk/arch/ppc/syslib/of_device.c

@@ -3,7 +3,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <asm/errno.h>
 #include <asm/of_device.h>
 
@@ -16,20 +15,20 @@
  * Used by a driver to check whether an of_device present in the
  * system is in its list of supported devices.
  */
-const struct of_device_id * of_match_device(const struct of_device_id *matches,
+const struct of_match * of_match_device(const struct of_match *matches,
 					const struct of_device *dev)
 {
 	if (!dev->node)
 		return NULL;
-	while (matches->name[0] || matches->type[0] || matches->compatible[0]) {
+	while (matches->name || matches->type || matches->compatible) {
 		int match = 1;
-		if (matches->name[0])
+		if (matches->name && matches->name != OF_ANY_MATCH)
 			match &= dev->node->name
 				&& !strcmp(matches->name, dev->node->name);
-		if (matches->type[0])
+		if (matches->type && matches->type != OF_ANY_MATCH)
 			match &= dev->node->type
 				&& !strcmp(matches->type, dev->node->type);
-		if (matches->compatible[0])
+		if (matches->compatible && matches->compatible != OF_ANY_MATCH)
 			match &= device_is_compatible(dev->node,
 				matches->compatible);
 		if (match)
@@ -43,7 +42,7 @@ static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
 {
 	struct of_device * of_dev = to_of_device(dev);
 	struct of_platform_driver * of_drv = to_of_platform_driver(drv);
-	const struct of_device_id * matches = of_drv->match_table;
+	const struct of_match * matches = of_drv->match_table;
 
 	if (!matches)
 		return 0;
@@ -76,7 +75,7 @@ static int of_device_probe(struct device *dev)
 	int error = -ENODEV;
 	struct of_platform_driver *drv;
 	struct of_device *of_dev;
-	const struct of_device_id *match;
+	const struct of_match *match;
 
 	drv = to_of_platform_driver(dev->driver);
 	of_dev = to_of_device(dev);

trunk/arch/ppc64/kernel/of_device.c

@@ -3,7 +3,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/mod_devicetable.h>
 #include <asm/errno.h>
 #include <asm/of_device.h>
 
@@ -16,20 +15,20 @@
  * Used by a driver to check whether an of_device present in the
  * system is in its list of supported devices.
  */
-const struct of_device_id *of_match_device(const struct of_device_id *matches,
+const struct of_match * of_match_device(const struct of_match *matches,
 					const struct of_device *dev)
 {
 	if (!dev->node)
 		return NULL;
-	while (matches->name[0] || matches->type[0] || matches->compatible[0]) {
+	while (matches->name || matches->type || matches->compatible) {
 		int match = 1;
-		if (matches->name[0])
+		if (matches->name && matches->name != OF_ANY_MATCH)
 			match &= dev->node->name
 				&& !strcmp(matches->name, dev->node->name);
-		if (matches->type[0])
+		if (matches->type && matches->type != OF_ANY_MATCH)
 			match &= dev->node->type
 				&& !strcmp(matches->type, dev->node->type);
-		if (matches->compatible[0])
+		if (matches->compatible && matches->compatible != OF_ANY_MATCH)
 			match &= device_is_compatible(dev->node,
 				matches->compatible);
 		if (match)
@@ -43,7 +42,7 @@ static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
 {
 	struct of_device * of_dev = to_of_device(dev);
 	struct of_platform_driver * of_drv = to_of_platform_driver(drv);
-	const struct of_device_id * matches = of_drv->match_table;
+	const struct of_match * matches = of_drv->match_table;
 
 	if (!matches)
 		return 0;
@@ -76,7 +75,7 @@ static int of_device_probe(struct device *dev)
 	int error = -ENODEV;
 	struct of_platform_driver *drv;
 	struct of_device *of_dev;
-	const struct of_device_id *match;
+	const struct of_match *match;
 
 	drv = to_of_platform_driver(dev->driver);
 	of_dev = to_of_device(dev);

trunk/crypto/cipher.c

@@ -336,6 +336,5 @@ int crypto_init_cipher_ops(struct crypto_tfm *tfm)
 
 void crypto_exit_cipher_ops(struct crypto_tfm *tfm)
 {
-	if (tfm->crt_cipher.cit_iv)
-		kfree(tfm->crt_cipher.cit_iv);
+	kfree(tfm->crt_cipher.cit_iv);
 }

trunk/crypto/hmac.c

@@ -49,8 +49,7 @@ int crypto_alloc_hmac_block(struct crypto_tfm *tfm)
 
 void crypto_free_hmac_block(struct crypto_tfm *tfm)
 {
-	if (tfm->crt_digest.dit_hmac_block)
-		kfree(tfm->crt_digest.dit_hmac_block);
+	kfree(tfm->crt_digest.dit_hmac_block);
 }
 
 void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen)

trunk/drivers/i2c/busses/i2c-keywest.c

@@ -698,7 +698,7 @@ dispose_iface(struct device *dev)
 }
 
 static int
-create_iface_macio(struct macio_dev* dev, const struct of_device_id *match)
+create_iface_macio(struct macio_dev* dev, const struct of_match *match)
 {
 	return create_iface(dev->ofdev.node, &dev->ofdev.dev);
 }
@@ -710,7 +710,7 @@ dispose_iface_macio(struct macio_dev* dev)
 }
 
 static int
-create_iface_of_platform(struct of_device* dev, const struct of_device_id *match)
+create_iface_of_platform(struct of_device* dev, const struct of_match *match)
 {
 	return create_iface(dev->node, &dev->dev);
 }
@@ -721,9 +721,10 @@ dispose_iface_of_platform(struct of_device* dev)
 	return dispose_iface(&dev->dev);
 }
 
-static struct of_device_id i2c_keywest_match[] = 
+static struct of_match i2c_keywest_match[] = 
 {
 	{
+	.name 		= OF_ANY_MATCH,
 	.type		= "i2c",
 	.compatible	= "keywest"
 	},

trunk/drivers/ide/ppc/pmac.c

@@ -1419,7 +1419,7 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
  * Attach to a macio probed interface
  */
 static int __devinit
-pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
+pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_match *match)
 {
 	void __iomem *base;
 	unsigned long regbase;
@@ -1637,19 +1637,27 @@ pmac_ide_pci_resume(struct pci_dev *pdev)
 	return rc;
 }
 
-static struct of_device_id pmac_ide_macio_match[] = 
+static struct of_match pmac_ide_macio_match[] = 
 {
 	{
 	.name 		= "IDE",
+	.type		= OF_ANY_MATCH,
+	.compatible	= OF_ANY_MATCH
 	},
 	{
 	.name 		= "ATA",
+	.type		= OF_ANY_MATCH,
+	.compatible	= OF_ANY_MATCH
 	},
 	{
+	.name 		= OF_ANY_MATCH,
 	.type		= "ide",
+	.compatible	= OF_ANY_MATCH
 	},
 	{
+	.name 		= OF_ANY_MATCH,
 	.type		= "ata",
+	.compatible	= OF_ANY_MATCH
 	},
 	{},
 };

trunk/drivers/ieee1394/ieee1394_core.h

@@ -38,8 +38,8 @@ struct hpsb_packet {
 
         /* These are core internal. */
         signed char tlabel;
-	signed char ack_code;
-	unsigned char tcode;
+        char ack_code;
+        char tcode;
 
         unsigned expect_response:1;
         unsigned no_waiter:1;

trunk/drivers/macintosh/Makefile

@@ -4,7 +4,7 @@
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_PPC_PMAC)		+= macio_asic.o macio_sysfs.o
+obj-$(CONFIG_PPC_PMAC)		+= macio_asic.o
 
 obj-$(CONFIG_PMAC_MEDIABAY)	+= mediabay.o
 obj-$(CONFIG_MAC_EMUMOUSEBTN)	+= mac_hid.o