[kernel] r21950 - 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

[Ben Hutchings]

Author: benh
Date: Fri Oct 17 09:48:43 2014
New Revision: 21950

Log:
Merge changes from sid up to 3.16-2

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

Modified: dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real	Wed Oct 15 07:13:24 2014	(r21949)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real	Fri Oct 17 09:48:43 2014	(r21950)
@@ -2,8 +2,6 @@
 
 top_srcdir = ../..
 
-CFLAGS += -I$(top_srcdir)/include
-
 include $(top_srcdir)/debian/build/Makefile.inc
 
 modpost.real-$(TYPE): file2alias.real-$(TYPE).o modpost.real-$(TYPE).o sumversion.real-$(TYPE).o
@@ -13,7 +11,7 @@
 	$(CC) -I real-$(TYPE) $(CFLAGS) -c -o $@ $<
 
 real-$(TYPE)/devicetable-offsets.s: $(SOURCEDIR)/devicetable-offsets.c
-	$(CC) -include real-$(TYPE)/types.h $(CFLAGS) -S -o $@ $<
+	$(CC) -include real-$(TYPE)/types.h $(CFLAGS) -nostdinc -I$(top_srcdir)/include -S -o $@ $<
 
 real-$(TYPE)/devicetable-offsets.h: real-$(TYPE)/devicetable-offsets.s
 	echo >$@ "#define __DEVICEVTABLE_OFFSETS_H__"

Modified: dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h	Wed Oct 15 07:13:24 2014	(r21949)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-32/types.h	Fri Oct 17 09:48:43 2014	(r21950)
@@ -1,2 +1,3 @@
-#include <linux/types.h>
+#include "../types.h"
 typedef __u32 kernel_ulong_t;
+#define BITS_PER_LONG 32

Modified: dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h	Wed Oct 15 07:13:24 2014	(r21949)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/real-lsb-64/types.h	Fri Oct 17 09:48:43 2014	(r21950)
@@ -1,2 +1,3 @@
-#include <linux/types.h>
+#include "../types.h"
 typedef __u64 __attribute__((aligned(8))) kernel_ulong_t;
+#define BITS_PER_LONG 64

Modified: dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-32/types.h
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-32/types.h	Wed Oct 15 07:13:24 2014	(r21949)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-32/types.h	Fri Oct 17 09:48:43 2014	(r21950)
@@ -1,2 +1,3 @@
-#include <linux/types.h>
+#include "../types.h"
 typedef __u32 kernel_ulong_t;
+#define BITS_PER_LONG 32

Modified: dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-64/types.h
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-64/types.h	Wed Oct 15 07:13:24 2014	(r21949)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/real-msb-64/types.h	Fri Oct 17 09:48:43 2014	(r21950)
@@ -1,2 +1,3 @@
-#include <linux/types.h>
+#include "../types.h"
 typedef __u64 __attribute__((aligned(8))) kernel_ulong_t;
+#define BITS_PER_LONG 64

Copied: dists/trunk/linux-tools/debian/build/scripts/mod/types.h (from r21798, dists/sid/linux-tools/debian/build/scripts/mod/types.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/types.h	Fri Oct 17 09:48:43 2014	(r21950, copy of r21798, dists/sid/linux-tools/debian/build/scripts/mod/types.h)
@@ -0,0 +1,6 @@
+/* Minimal definitions for mod_devicetable.h and devicetable-offsets.c */
+typedef unsigned char __u8;
+typedef unsigned short __u16;
+typedef unsigned int __u32;
+typedef unsigned long long __u64;
+#define offsetof(a,b) __builtin_offsetof(a,b)

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Wed Oct 15 07:13:24 2014	(r21949)
+++ dists/trunk/linux-tools/debian/changelog	Fri Oct 17 09:48:43 2014	(r21950)
@@ -1,3 +1,12 @@
+linux-tools (3.16-2) unstable; urgency=medium
+
+  * linux-kbuild: Change the type headers used for devicetable-offsets.c
+    to avoid depending on UAPI headers or <linux/types.h>.  This really
+    closes: #754213.  It also fixes modpost handling of input device IDs
+    when host and target have differing word size.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 09 Sep 2014 13:21:05 +0100
+
 linux-tools (3.16-1) unstable; urgency=medium
 
   * New upstream release