[kernel] r20197 - in dists/trunk/linux-tools: . debian debian/build/scripts/mod debian/build/scripts/mod/real-lsb-32 debian/build/scripts/mod/real-lsb-64 debian/build/scripts/mod/real-msb-32 debian/build/scripts/mod/real-msb-64 debian/build/tools/perf

[Ben Hutchings]

Author: benh
Date: Mon Jun  3 13:21:38 2013
New Revision: 20197

Log:
Merge changes from sid up to 3.9.4-1

Added:
   dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h
      - copied unchanged from r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h
   dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h
      - copied unchanged from r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h
   dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-32/types.h
      - copied unchanged from r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-msb-32/types.h
   dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-64/types.h
      - copied unchanged from r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-msb-64/types.h
Modified:
   dists/trunk/linux-tools/   (props changed)
   dists/trunk/linux-tools/debian/build/scripts/mod/Makefile
   dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real
   dists/trunk/linux-tools/debian/build/tools/perf/Makefile
   dists/trunk/linux-tools/debian/changelog

Modified: dists/trunk/linux-tools/debian/build/scripts/mod/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/Makefile	Mon Jun  3 13:17:24 2013	(r20196)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/Makefile	Mon Jun  3 13:21:38 2013	(r20197)
@@ -21,4 +21,4 @@
 modpost.o: modpost.c modpost.h
 
 clean:
-	rm -f modpost.h
+	rm -f modpost.h real-*/devicetable-offsets.*

Modified: dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real	Mon Jun  3 13:17:24 2013	(r20196)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real	Mon Jun  3 13:21:38 2013	(r20197)
@@ -12,15 +12,8 @@
 %.real-$(TYPE).o: $(SOURCEDIR)/%.c real-$(TYPE)/devicetable-offsets.h
 	$(CC) -I real-$(TYPE) $(CFLAGS) -c -o $@ $<
 
-WORD_SIZE := $(subst lsb-,,$(subst msb-,,$(TYPE)))
-
-# XXX This doesn't quite work, because if we cross-build between 64-bit
-# architectures they may have different alignment for pointers (aka
-# kernel_ulong_t).  This particularly affects i2c_device_id and
-# platform_device_id.
-
 real-$(TYPE)/devicetable-offsets.s: $(SOURCEDIR)/devicetable-offsets.c
-	$(CC) $(CFLAGS) -include linux/types.h -Dkernel_ulong_t=__u$(WORD_SIZE) -S -o $@ $<
+	$(CC) -include real-$(TYPE)/types.h $(CFLAGS) -S -o $@ $<
 
 real-$(TYPE)/devicetable-offsets.h: real-$(TYPE)/devicetable-offsets.s
 	echo >$@ "#define __DEVICEVTABLE_OFFSETS_H__"

Copied: dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h (from r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h	Mon Jun  3 13:21:38 2013	(r20197, copy of r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h)
@@ -0,0 +1,2 @@
+#include <linux/types.h>
+typedef __u32 kernel_ulong_t;

Copied: dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h (from r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h	Mon Jun  3 13:21:38 2013	(r20197, copy of r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h)
@@ -0,0 +1,2 @@
+#include <linux/types.h>
+typedef __u64 __attribute__((aligned(8))) kernel_ulong_t;

Copied: dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-32/types.h (from r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-msb-32/types.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-32/types.h	Mon Jun  3 13:21:38 2013	(r20197, copy of r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-msb-32/types.h)
@@ -0,0 +1,2 @@
+#include <linux/types.h>
+typedef __u32 kernel_ulong_t;

Copied: dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-64/types.h (from r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-msb-64/types.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-64/types.h	Mon Jun  3 13:21:38 2013	(r20197, copy of r20196, dists/sid/linux-tools/debian/build/scripts/mod/real-msb-64/types.h)
@@ -0,0 +1,2 @@
+#include <linux/types.h>
+typedef __u64 __attribute__((aligned(8))) kernel_ulong_t;

Modified: dists/trunk/linux-tools/debian/build/tools/perf/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/tools/perf/Makefile	Mon Jun  3 13:17:24 2013	(r20196)
+++ dists/trunk/linux-tools/debian/build/tools/perf/Makefile	Mon Jun  3 13:21:38 2013	(r20197)
@@ -50,4 +50,4 @@
 endif
 
 clean:
-	rm -rf doc out
+	rm -rf config doc out

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Mon Jun  3 13:17:24 2013	(r20196)
+++ dists/trunk/linux-tools/debian/changelog	Mon Jun  3 13:21:38 2013	(r20197)
@@ -1,8 +1,17 @@
-linux-tools (3.9.3-1~experimental.1) UNRELEASED; urgency=low
+linux-tools (3.9.4-1) unstable; urgency=low
 
   * New upstream release
 
- -- Ben Hutchings <ben at decadent.org.uk>  Tue, 21 May 2013 02:15:28 +0100
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 03 Jun 2013 13:45:52 +0100
+
+linux-tools (3.8.11-1) unstable; urgency=low
+
+  * New upstream stable update
+
+  [ Ben Hutchings ]
+  * Upload to unstable (Closes: #707023)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 07 May 2013 02:11:16 +0100
 
 linux-tools (3.8.2-1~experimental.1) experimental; urgency=low