r1030 - in linux-kernel-headers/trunk/debian: . patches
Author: dan
Date: 2005-10-13 18:55:12 +0000 (Thu, 13 Oct 2005)
New Revision: 1030
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch
linux-kernel-headers/trunk/debian/patches/linux-types-long-long.patch
Log:
* Add patch from Hirokazu Takata <takata@linux-m32r.org> for m32r
(Closes: #327779).
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2005-10-13 18:50:11 UTC (rev 1029)
+++ linux-kernel-headers/trunk/debian/changelog 2005-10-13 18:55:12 UTC (rev 1030)
@@ -1,8 +1,10 @@
linux-kernel-headers (2.6.13+0rc3-2) unstable; urgency=low
* Acknowledge NMU from Adeodato Simó (Closes: #320515). Thanks!
+ * Add patch from Hirokazu Takata <takata@linux-m32r.org> for m32r
+ (Closes: #327779).
- -- Daniel Jacobowitz <dan@debian.org> Thu, 13 Oct 2005 14:48:15 -0400
+ -- Daniel Jacobowitz <dan@debian.org> Thu, 13 Oct 2005 14:54:20 -0400
linux-kernel-headers (2.6.13+0rc3-1.1) unstable; urgency=low
Modified: linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch 2005-10-13 18:50:11 UTC (rev 1029)
+++ linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch 2005-10-13 18:55:12 UTC (rev 1030)
@@ -30,6 +30,22 @@
#endif
#endif /* __ASSEMBLY__ */
+diff -Nuar include.org/asm-m32r/types.h include/asm-m32r/types.h
+--- include.org/asm-m32r/types.h 2005-07-13 13:46:46.000000000 +0900
++++ include/asm-m32r/types.h 2005-09-07 13:30:25.000000000 +0900
+@@ -23,9 +23,9 @@
+ typedef __signed__ int __s32;
+ typedef unsigned int __u32;
+
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-typedef __signed__ long long __s64;
+-typedef unsigned long long __u64;
++#if defined(__GNUC__)
++__extension__ typedef __signed__ long long __s64;
++__extension__ typedef unsigned long long __u64;
+ #endif
+ #endif /* __ASSEMBLY__ */
+
diff -Nuar include.org/asm-m68k/types.h include/asm-m68k/types.h
--- include.org/asm-m68k/types.h 2003-10-16 00:09:42.000000000 +0900
+++ include/asm-m68k/types.h 2004-07-31 23:00:13.000000000 +0900
Modified: linux-kernel-headers/trunk/debian/patches/linux-types-long-long.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-types-long-long.patch 2005-10-13 18:50:11 UTC (rev 1029)
+++ linux-kernel-headers/trunk/debian/patches/linux-types-long-long.patch 2005-10-13 18:55:12 UTC (rev 1030)
@@ -85,6 +85,18 @@
typedef int __kernel_pid_t;
typedef int __kernel_ipc_pid_t;
typedef unsigned int __kernel_uid_t;
+diff -Nurp include.orig/asm-m32r/posix_types.h include/asm-m32r/posix_types.h
+--- include.orig/asm-m32r/posix_types.h 2005-07-13 13:46:46.000000000 +0900
++++ include/asm-m32r/posix_types.h 2005-09-07 13:24:21.000000000 +0900
+@@ -39,7 +39,7 @@ typedef unsigned short __kernel_old_gid_
+ typedef unsigned short __kernel_old_dev_t;
+
+ #ifdef __GNUC__
+-typedef long long __kernel_loff_t;
++__extension__ typedef long long __kernel_loff_t;
+ #endif
+
+ typedef struct {
diff -Nurp include.orig/asm-m68k/posix_types.h include/asm-m68k/posix_types.h
--- include.orig/asm-m68k/posix_types.h 2003-10-15 11:10:27.000000000 -0400
+++ include/asm-m68k/posix_types.h 2003-11-23 16:08:42.000000000 -0500
Reply to: