---

yaml --- r: 334477 b: refs/heads/master c: 72523d8 h: refs/heads/master i: 334475: 99e2f5e v: v3
git-mirror · Oct 17, 2012 · 33d6a3e · 33d6a3e
1 parent 277dbb0
commit 33d6a3e
Show file tree

Hide file tree

Showing 64 changed files with 172 additions and 205 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bab58350e565756df9e45daafe8301a309b35e7e
+refs/heads/master: 72523d8082df3d89bffe30cbc1356dbb45ab51ae
diff --git a/trunk/Makefile b/trunk/Makefile
@@ -437,9 +437,7 @@ endif
 PHONY += asm-generic
 asm-generic:
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
-	            src=asm obj=arch/$(SRCARCH)/include/generated/asm
-	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \
-	            src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm
+	            obj=arch/$(SRCARCH)/include/generated/asm
 
 # To make sure we do not include .config for any of the *config targets
 # catch them early, and hand them over to scripts/kconfig/Makefile

diff --git a/trunk/arch/arm/mach-omap1/board-ams-delta.c b/trunk/arch/arm/mach-omap1/board-ams-delta.c
@@ -444,28 +444,16 @@ static struct omap1_cam_platform_data ams_delta_camera_platform_data = {
 	.lclk_khz_max	= 1334,		/* results in 5fps CIF, 10fps QCIF */
 };
 
-static struct platform_device ams_delta_audio_device = {
-	.name   = "ams-delta-audio",
-	.id     = -1,
-};
-
-static struct platform_device cx20442_codec_device = {
-	.name   = "cx20442-codec",
-	.id     = -1,
-};
-
 static struct platform_device *ams_delta_devices[] __initdata = {
 	&latch1_gpio_device,
 	&latch2_gpio_device,
 	&ams_delta_kp_device,
 	&ams_delta_camera_device,
-	&ams_delta_audio_device,
 };
 
 static struct platform_device *late_devices[] __initdata = {
 	&ams_delta_nand_device,
 	&ams_delta_lcd_device,
-	&cx20442_codec_device,
 };
 
 static void __init ams_delta_init(void)

diff --git a/trunk/arch/ia64/include/uapi/asm/Kbuild b/trunk/arch/ia64/include/uapi/asm/Kbuild
@@ -1,8 +1,6 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
-generic-y += kvm_para.h
-
 header-y += auxvec.h
 header-y += bitsperlong.h
 header-y += break.h

diff --git a/trunk/arch/ia64/include/uapi/asm/kvm_para.h b/trunk/arch/ia64/include/uapi/asm/kvm_para.h
diff --git a/trunk/arch/mips/include/asm/Kbuild b/trunk/arch/mips/include/asm/Kbuild
@@ -1 +0,0 @@
-# MIPS headers

diff --git a/trunk/arch/mn10300/include/uapi/asm/setup.h b/trunk/arch/mn10300/include/uapi/asm/setup.h
@@ -1,4 +0,0 @@
-/*
- * There isn't anything here anymore, but the file must not be empty or patch
- * will delete it.
- */

diff --git a/trunk/arch/powerpc/perf/core-book3s.c b/trunk/arch/powerpc/perf/core-book3s.c
@@ -1463,7 +1463,7 @@ static void perf_event_interrupt(struct pt_regs *regs)
 		if (!event->hw.idx || is_limited_pmc(event->hw.idx))
 			continue;
 		val = read_pmc(event->hw.idx);
-		if (pmc_overflow(val)) {
+		if ((int)val < 0) {
 			/* event has overflowed */
 			found = 1;
 			record_and_restart(event, val, regs);

diff --git a/trunk/arch/s390/include/uapi/asm/Kbuild b/trunk/arch/s390/include/uapi/asm/Kbuild
@@ -1,8 +1,6 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
-generic-y += kvm_para.h
-
 header-y += auxvec.h
 header-y += bitsperlong.h
 header-y += byteorder.h

diff --git a/trunk/arch/s390/include/uapi/asm/kvm_para.h b/trunk/arch/s390/include/uapi/asm/kvm_para.h
diff --git a/trunk/arch/sh/include/uapi/asm/hw_breakpoint.h b/trunk/arch/sh/include/uapi/asm/hw_breakpoint.h
@@ -1,4 +0,0 @@
-/*
- * There isn't anything here anymore, but the file must not be empty or patch
- * will delete it.
- */

diff --git a/trunk/arch/sparc/include/uapi/asm/sigcontext.h b/trunk/arch/sparc/include/uapi/asm/sigcontext.h
@@ -1,4 +0,0 @@
-/*
- * There isn't anything here anymore, but the file must not be empty or patch
- * will delete it.
- */

diff --git a/trunk/arch/tile/include/arch/Kbuild b/trunk/arch/tile/include/arch/Kbuild
@@ -1 +0,0 @@
-# Tile arch headers

diff --git a/trunk/arch/tile/include/asm/Kbuild b/trunk/arch/tile/include/asm/Kbuild
@@ -1,6 +1,8 @@
 
 header-y += ../arch/
 
+header-y += ucontext.h
+
 generic-y += bug.h
 generic-y += bugs.h
 generic-y += clkdev.h
@@ -35,4 +37,5 @@ generic-y += statfs.h
 generic-y += termbits.h
 generic-y += termios.h
 generic-y += types.h
+generic-y += ucontext.h
 generic-y += xor.h
diff --git a/trunk/arch/tile/include/uapi/asm/Kbuild b/trunk/arch/tile/include/uapi/asm/Kbuild
@@ -15,7 +15,4 @@ header-y += siginfo.h
 header-y += signal.h
 header-y += stat.h
 header-y += swab.h
-header-y += ucontext.h
 header-y += unistd.h
-
-generic-y += ucontext.h
diff --git a/trunk/drivers/of/address.c b/trunk/drivers/of/address.c
@@ -37,9 +37,9 @@ struct of_bus {
 	int		(*match)(struct device_node *parent);
 	void		(*count_cells)(struct device_node *child,
 				       int *addrc, int *sizec);
-	u64		(*map)(__be32 *addr, const __be32 *range,
+	u64		(*map)(u32 *addr, const __be32 *range,
 				int na, int ns, int pna);
-	int		(*translate)(__be32 *addr, u64 offset, int na);
+	int		(*translate)(u32 *addr, u64 offset, int na);
 	unsigned int	(*get_flags)(const __be32 *addr);
 };
 
@@ -56,7 +56,7 @@ static void of_bus_default_count_cells(struct device_node *dev,
 		*sizec = of_n_size_cells(dev);
 }
 
-static u64 of_bus_default_map(__be32 *addr, const __be32 *range,
+static u64 of_bus_default_map(u32 *addr, const __be32 *range,
 		int na, int ns, int pna)
 {
 	u64 cp, s, da;
@@ -82,7 +82,7 @@ static u64 of_bus_default_map(__be32 *addr, const __be32 *range,
 	return da - cp;
 }
 
-static int of_bus_default_translate(__be32 *addr, u64 offset, int na)
+static int of_bus_default_translate(u32 *addr, u64 offset, int na)
 {
 	u64 a = of_read_number(addr, na);
 	memset(addr, 0, na * 4);
@@ -138,7 +138,7 @@ static unsigned int of_bus_pci_get_flags(const __be32 *addr)
 	return flags;
 }
 
-static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns,
+static u64 of_bus_pci_map(u32 *addr, const __be32 *range, int na, int ns,
 		int pna)
 {
 	u64 cp, s, da;
@@ -165,7 +165,7 @@ static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns,
 	return da - cp;
 }
 
-static int of_bus_pci_translate(__be32 *addr, u64 offset, int na)
+static int of_bus_pci_translate(u32 *addr, u64 offset, int na)
 {
 	return of_bus_default_translate(addr + 1, offset, na - 1);
 }
@@ -247,7 +247,7 @@ static void of_bus_isa_count_cells(struct device_node *child,
 		*sizec = 1;
 }
 
-static u64 of_bus_isa_map(__be32 *addr, const __be32 *range, int na, int ns,
+static u64 of_bus_isa_map(u32 *addr, const __be32 *range, int na, int ns,
 		int pna)
 {
 	u64 cp, s, da;
@@ -270,7 +270,7 @@ static u64 of_bus_isa_map(__be32 *addr, const __be32 *range, int na, int ns,
 	return da - cp;
 }
 
-static int of_bus_isa_translate(__be32 *addr, u64 offset, int na)
+static int of_bus_isa_translate(u32 *addr, u64 offset, int na)
 {
 	return of_bus_default_translate(addr + 1, offset, na - 1);
 }
@@ -338,7 +338,7 @@ static struct of_bus *of_match_bus(struct device_node *np)
 }
 
 static int of_translate_one(struct device_node *parent, struct of_bus *bus,
-			    struct of_bus *pbus, __be32 *addr,
+			    struct of_bus *pbus, u32 *addr,
 			    int na, int ns, int pna, const char *rprop)
 {
 	const __be32 *ranges;
@@ -409,12 +409,12 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
  * that can be mapped to a cpu physical address). This is not really specified
  * that way, but this is traditionally the way IBM at least do things
  */
-static u64 __of_translate_address(struct device_node *dev,
-				  const __be32 *in_addr, const char *rprop)
+u64 __of_translate_address(struct device_node *dev, const __be32 *in_addr,
+			   const char *rprop)
 {
 	struct device_node *parent = NULL;
 	struct of_bus *bus, *pbus;
-	__be32 addr[OF_MAX_ADDR_CELLS];
+	u32 addr[OF_MAX_ADDR_CELLS];
 	int na, ns, pna, pns;
 	u64 result = OF_BAD_ADDR;
 

diff --git a/trunk/drivers/of/irq.c b/trunk/drivers/of/irq.c
@@ -192,13 +192,11 @@ int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
 			/* Compare specifiers */
 			match = 1;
 			for (i = 0; i < addrsize && match; ++i) {
-				__be32 mask = imask ? imask[i]
-						    : cpu_to_be32(0xffffffffu);
+				u32 mask = imask ? imask[i] : 0xffffffffu;
 				match = ((addr[i] ^ imap[i]) & mask) == 0;
 			}
 			for (; i < (addrsize + intsize) && match; ++i) {
-				__be32 mask = imask ? imask[i]
-						    : cpu_to_be32(0xffffffffu);
+				u32 mask = imask ? imask[i] : 0xffffffffu;
 				match =
 				   ((intspec[i-addrsize] ^ imap[i]) & mask) == 0;
 			}
@@ -467,7 +465,7 @@ void __init of_irq_init(const struct of_device_id *matches)
 			pr_debug("of_irq_init: init %s @ %p, parent %p\n",
 				 match->compatible,
 				 desc->dev, desc->interrupt_parent);
-			irq_init_cb = (of_irq_init_cb_t)match->data;
+			irq_init_cb = match->data;
 			ret = irq_init_cb(desc->dev, desc->interrupt_parent);
 			if (ret) {
 				kfree(desc);

diff --git a/trunk/drivers/of/platform.c b/trunk/drivers/of/platform.c
@@ -76,7 +76,7 @@ void of_device_make_bus_id(struct device *dev)
 {
 	static atomic_t bus_no_reg_magic;
 	struct device_node *node = dev->of_node;
-	const __be32 *reg;
+	const u32 *reg;
 	u64 addr;
 	const __be32 *addrp;
 	int magic;

diff --git a/trunk/include/Kbuild b/trunk/include/Kbuild
@@ -1,8 +1,12 @@
 # Top-level Makefile calls into asm-$(ARCH)
 # List only non-arch directories below
 
+header-y += asm-generic/
 header-y += linux/
 header-y += sound/
+header-y += mtd/
 header-y += rdma/
 header-y += video/
+header-y += drm/
+header-y += xen/
 header-y += scsi/
diff --git a/trunk/include/asm-generic/Kbuild b/trunk/include/asm-generic/Kbuild
diff --git a/trunk/include/drm/Kbuild b/trunk/include/drm/Kbuild
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
@@ -1,5 +1,31 @@
+header-y += byteorder/
+header-y += can/
+header-y += caif/
 header-y += dvb/
 header-y += hdlc/
 header-y += hsi/
+header-y += isdn/
+header-y += mmc/
+header-y += nfsd/
 header-y += raid/
+header-y += spi/
+header-y += sunrpc/
+header-y += tc_act/
+header-y += tc_ematch/
+header-y += netfilter/
+header-y += netfilter_arp/
+header-y += netfilter_bridge/
+header-y += netfilter_ipv4/
+header-y += netfilter_ipv6/
 header-y += usb/
+header-y += wimax/
+
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
+		  $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)
+endif
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
+		  $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h),)
+endif
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
+		  $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),)
+endif
diff --git a/trunk/include/linux/byteorder/Kbuild b/trunk/include/linux/byteorder/Kbuild
diff --git a/trunk/include/linux/caif/Kbuild b/trunk/include/linux/caif/Kbuild
diff --git a/trunk/include/linux/can/Kbuild b/trunk/include/linux/can/Kbuild
diff --git a/trunk/include/linux/isdn/Kbuild b/trunk/include/linux/isdn/Kbuild
diff --git a/trunk/include/linux/mmc/Kbuild b/trunk/include/linux/mmc/Kbuild
diff --git a/trunk/include/linux/netfilter/Kbuild b/trunk/include/linux/netfilter/Kbuild
@@ -0,0 +1 @@
+header-y += ipset/
diff --git a/trunk/include/linux/netfilter/ipset/Kbuild b/trunk/include/linux/netfilter/ipset/Kbuild
diff --git a/trunk/include/linux/netfilter_arp/Kbuild b/trunk/include/linux/netfilter_arp/Kbuild
diff --git a/trunk/include/linux/netfilter_bridge/Kbuild b/trunk/include/linux/netfilter_bridge/Kbuild
diff --git a/trunk/include/linux/netfilter_ipv4/Kbuild b/trunk/include/linux/netfilter_ipv4/Kbuild
diff --git a/trunk/include/linux/netfilter_ipv6/Kbuild b/trunk/include/linux/netfilter_ipv6/Kbuild
diff --git a/trunk/include/linux/nfsd/Kbuild b/trunk/include/linux/nfsd/Kbuild
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
@@ -331,13 +331,6 @@ static inline bool of_have_populated_dt(void)
 #define for_each_child_of_node(parent, child) \
 	while (0)
 
-static inline struct device_node *of_get_child_by_name(
-					const struct device_node *node,
-					const char *name)
-{
-	return NULL;
-}
-
 static inline int of_get_child_count(const struct device_node *np)
 {
 	return 0;

diff --git a/trunk/include/linux/of_address.h b/trunk/include/linux/of_address.h
@@ -19,7 +19,7 @@ extern void __iomem *of_iomap(struct device_node *device, int index);
  * the address space flags too. The PCI version uses a BAR number
  * instead of an absolute index
  */
-extern const __be32 *of_get_address(struct device_node *dev, int index,
+extern const u32 *of_get_address(struct device_node *dev, int index,
 			   u64 *size, unsigned int *flags);
 
 #ifndef pci_address_to_pio
@@ -44,7 +44,7 @@ static inline void __iomem *of_iomap(struct device_node *device, int index)
 {
 	return NULL;
 }
-static inline const __be32 *of_get_address(struct device_node *dev, int index,
+static inline const u32 *of_get_address(struct device_node *dev, int index,
 					u64 *size, unsigned int *flags)
 {
 	return NULL;

diff --git a/trunk/include/linux/of_irq.h b/trunk/include/linux/of_irq.h
@@ -58,8 +58,8 @@ static inline int of_irq_map_oldworld(struct device_node *device, int index,
 #endif /* CONFIG_PPC32 && CONFIG_PPC_PMAC */
 
 
-extern int of_irq_map_raw(struct device_node *parent, const __be32 *intspec,
-			  u32 ointsize, const __be32 *addr,
+extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
+			  u32 ointsize, const u32 *addr,
 			  struct of_irq *out_irq);
 extern int of_irq_map_one(struct device_node *device, int index,
 			  struct of_irq *out_irq);

diff --git a/trunk/include/linux/spi/Kbuild b/trunk/include/linux/spi/Kbuild
diff --git a/trunk/include/linux/sunrpc/Kbuild b/trunk/include/linux/sunrpc/Kbuild
diff --git a/trunk/include/linux/tc_act/Kbuild b/trunk/include/linux/tc_act/Kbuild
diff --git a/trunk/include/linux/tc_ematch/Kbuild b/trunk/include/linux/tc_ematch/Kbuild
diff --git a/trunk/include/linux/wimax/Kbuild b/trunk/include/linux/wimax/Kbuild
diff --git a/trunk/include/mtd/Kbuild b/trunk/include/mtd/Kbuild
diff --git a/trunk/include/uapi/asm-generic/kvm_para.h b/trunk/include/uapi/asm-generic/kvm_para.h
@@ -1,4 +0,0 @@
-/*
- * There isn't anything here, but the file must not be empty or patch
- * will delete it.
- */

diff --git a/trunk/include/uapi/linux/irqnr.h b/trunk/include/uapi/linux/irqnr.h
@@ -1,4 +0,0 @@
-/*
- * There isn't anything here anymore, but the file must not be empty or patch
- * will delete it.
- */

diff --git a/trunk/include/xen/Kbuild b/trunk/include/xen/Kbuild
diff --git a/trunk/scripts/Makefile.asm-generic b/trunk/scripts/Makefile.asm-generic
@@ -5,7 +5,7 @@
 # and for each file listed in this file with generic-y creates
 # a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm)
 
-kbuild-file := $(srctree)/arch/$(SRCARCH)/include/$(src)/Kbuild
+kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild
 -include $(kbuild-file)
 
 include scripts/Kbuild.include