r1861 - in linux-kernel-headers/trunk/debian: . patches
Author: schizo
Date: 2006-10-19 20:59:59 +0000 (Thu, 19 Oct 2006)
New Revision: 1861
Added:
linux-kernel-headers/trunk/debian/patches/m32r-removed-unknown-isa.patch
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/patches/series
Log:
* Add m32r-removed-unknown-isa.patch from Hirokazu Takata
<takata@linux-m32r.org>. closes: #394055.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2006-10-19 18:30:31 UTC (rev 1860)
+++ linux-kernel-headers/trunk/debian/changelog 2006-10-19 20:59:59 UTC (rev 1861)
@@ -1,3 +1,10 @@
+linux-kernel-headers (2.6.18-4) unstable; urgency=low
+
+ * Add m32r-removed-unknown-isa.patch from Hirokazu Takata
+ <takata@linux-m32r.org>. closes: #394055.
+
+ -- Clint Adams <schizo@debian.org> Thu, 19 Oct 2006 16:34:02 -0400
+
linux-kernel-headers (2.6.18-3) unstable; urgency=medium
* Add linux-ext2_fs.patch. closes: #301641.
Added: linux-kernel-headers/trunk/debian/patches/m32r-removed-unknown-isa.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/m32r-removed-unknown-isa.patch (rev 0)
+++ linux-kernel-headers/trunk/debian/patches/m32r-removed-unknown-isa.patch 2006-10-19 20:59:59 UTC (rev 1861)
@@ -0,0 +1,40 @@
+--- include/asm-m32r/ptrace.h.org 2006-10-19 21:49:31.000000000 +0900
++++ include/asm-m32r/ptrace.h 2006-10-19 21:50:02.000000000 +0900
+@@ -12,8 +12,6 @@
+ * Copyright (C) 2001-2002, 2004 Hirokazu Takata <takata at linux-m32r.org>
+ */
+
+-#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */
+-
+ /* 0 - 13 are integer registers (general purpose registers). */
+ #define PT_R4 0
+ #define PT_R5 1
+@@ -115,8 +113,6 @@ struct pt_regs {
+ unsigned long accl;
+ unsigned long dummy_acc1h;
+ unsigned long dummy_acc1l;
+-#else
+-#error unknown isa configuration
+ #endif
+ unsigned long psw;
+ unsigned long bpc; /* saved PC for TRAP syscalls */
+@@ -140,6 +136,8 @@ struct pt_regs {
+
+ #ifdef __KERNEL__
+
++#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */
++
+ #define __ARCH_SYS_PTRACE 1
+
+ #if defined(CONFIG_ISA_M32R2) || defined(CONFIG_CHIP_VDEC2)
+--- include/asm-m32r/sigcontext.h.org 2006-10-19 21:48:40.000000000 +0900
++++ include/asm-m32r/sigcontext.h 2006-10-19 21:48:54.000000000 +0900
+@@ -33,8 +33,6 @@ struct sigcontext {
+ unsigned long sc_accl;
+ unsigned long sc_dummy_acc1h;
+ unsigned long sc_dummy_acc1l;
+-#else
+-#error unknown isa configuration
+ #endif
+ unsigned long sc_psw;
+ unsigned long sc_bpc; /* saved PC for TRAP syscalls */
Modified: linux-kernel-headers/trunk/debian/patches/series
===================================================================
--- linux-kernel-headers/trunk/debian/patches/series 2006-10-19 18:30:31 UTC (rev 1860)
+++ linux-kernel-headers/trunk/debian/patches/series 2006-10-19 20:59:59 UTC (rev 1861)
@@ -36,3 +36,4 @@
asm-generic-div64.patch
linux-ext2_fs.patch
linux-ixjuser.patch
+m32r-removed-unknown-isa.patch -p0
Reply to: