Add some patches to fix build failures, requested by Guenter

5 files changed, 170 insertions, 0 deletions

diff --git a/patches/UniCore32-bugfix-Remove-definitions-in-asm-bug.h-to-solve-difference-between-nat.patch b/patches/UniCore32-bugfix-Remove-definitions-in-asm-bug.h-to-solve-difference-between-nat.patch
new file mode 100644
index 0000000..82b38c1
--- /dev/null
+++ b/patches/UniCore32-bugfix-Remove-definitions-in-asm-bug.h-to-solve-difference-between-nat.patch
@@ -0,0 +1,58 @@
+From 10e1e99e55378a65529c48753703c069aebce7af Mon Sep 17 00:00:00 2001
+From: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Thu, 14 Jun 2012 11:38:25 +0800
+Subject: [PATCH] UniCore32-bugfix: Remove definitions in asm/bug.h to solve
+ difference between native and cross compiler
+
+commit 10e1e99e55378a65529c48753703c069aebce7af upstream.
+
+For kernel/bound.c being compiled by native compiler, it will generate following errors in gcc 4.4.3:
+  CC      kernel/bounds.s
+In file included from include/linux/bug.h:4,
+                 from include/linux/page-flags.h:9,
+                 from kernel/bounds.c:9:
+arch/unicore32/include/asm/bug.h:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
+arch/unicore32/include/asm/bug.h:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
+
+So, we moved definitions in asm/bug.h to arch/unicore32/kernel/setup.h to solve the problem.
+
+Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Zefan Li <lizefan@huawei.com>
+---
+ arch/unicore32/include/asm/bug.h |    5 -----
+ arch/unicore32/kernel/setup.h    |    6 ++++++
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/arch/unicore32/include/asm/bug.h b/arch/unicore32/include/asm/bug.h
+index b1ff8ca..93a56f3 100644
+--- a/arch/unicore32/include/asm/bug.h
++++ b/arch/unicore32/include/asm/bug.h
+@@ -19,9 +19,4 @@ extern void die(const char *msg, struct pt_regs *regs, int err);
+ extern void uc32_notify_die(const char *str, struct pt_regs *regs,
+ 		struct siginfo *info, unsigned long err, unsigned long trap);
+ 
+-extern asmlinkage void __backtrace(void);
+-extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
+-
+-extern void __show_regs(struct pt_regs *);
+-
+ #endif /* __UNICORE_BUG_H__ */
+diff --git a/arch/unicore32/kernel/setup.h b/arch/unicore32/kernel/setup.h
+index f239550..30f749d 100644
+--- a/arch/unicore32/kernel/setup.h
++++ b/arch/unicore32/kernel/setup.h
+@@ -30,4 +30,10 @@ extern char __vectors_start[], __vectors_end[];
+ extern void kernel_thread_helper(void);
+ 
+ extern void __init early_signal_init(void);
++
++extern asmlinkage void __backtrace(void);
++extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
++
++extern void __show_regs(struct pt_regs *);
++
+ #endif
+-- 
+1.7.9.5
+
diff --git a/patches/UniCore32-bugfix-fix-mismatch-return-value-of-__xchg_bad_pointer.patch b/patches/UniCore32-bugfix-fix-mismatch-return-value-of-__xchg_bad_pointer.patch
new file mode 100644
index 0000000..7261b4a
--- /dev/null
+++ b/patches/UniCore32-bugfix-fix-mismatch-return-value-of-__xchg_bad_pointer.patch
@@ -0,0 +1,37 @@
+From 195d4577d1d7ab1f0398b3190547c116b56f435f Mon Sep 17 00:00:00 2001
+From: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Date: Thu, 14 Jun 2012 15:39:48 +0800
+Subject: [PATCH] UniCore32-bugfix: fix mismatch return value of
+ __xchg_bad_pointer
+
+commit 195d4577d1d7ab1f0398b3190547c116b56f435f upstream.
+
+When disintegrate system.h, I left an error in asm/cmpxchg.h, which
+will result in following error:
+
+arch/unicore32/include/asm/cmpxchg.h: In function '__xchg':
+arch/unicore32/include/asm/cmpxchg.h:38: error: void value not ignored as it ought to be
+
+Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Zefan Li <lizefan@huawei.com>
+---
+ arch/unicore32/include/asm/cmpxchg.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/unicore32/include/asm/cmpxchg.h b/arch/unicore32/include/asm/cmpxchg.h
+index df4d5ac..8e797ad 100644
+--- a/arch/unicore32/include/asm/cmpxchg.h
++++ b/arch/unicore32/include/asm/cmpxchg.h
+@@ -35,7 +35,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
+ 			: "memory", "cc");
+ 		break;
+ 	default:
+-		ret = __xchg_bad_pointer();
++		__xchg_bad_pointer();
+ 	}
+ 
+ 	return ret;
+-- 
+1.7.9.5
+
diff --git a/patches/alpha-Fix-fall-out-from-disintegrating-asm-system.h.patch b/patches/alpha-Fix-fall-out-from-disintegrating-asm-system.h.patch
new file mode 100644
index 0000000..43e89ec
--- /dev/null
+++ b/patches/alpha-Fix-fall-out-from-disintegrating-asm-system.h.patch
@@ -0,0 +1,36 @@
+From d1b5153f3ec83789b71d64efaf2a880c8fe6358e Mon Sep 17 00:00:00 2001
+From: Michael Cree <mcree@orcon.net.nz>
+Date: Sun, 19 Aug 2012 14:41:04 +1200
+Subject: [PATCH] alpha: Fix fall-out from disintegrating asm/system.h
+
+commit d1b5153f3ec83789b71d64efaf2a880c8fe6358e upstream.
+
+Commit ec2212088c42 ("Disintegrate asm/system.h for Alpha") removed
+asm/system.h however arch/alpha/oprofile/common.c requires definitions
+that were shifted from asm/system.h to asm/special_insns.h.  Include
+that.
+
+Signed-off-by: Michael Cree <mcree@orcon.net.nz>
+Acked-by: Matt Turner <mattst88@gmail.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Zefan Li <lizefan@huawei.com>
+---
+ arch/alpha/oprofile/common.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c
+index a0a5d27..b8ce18f 100644
+--- a/arch/alpha/oprofile/common.c
++++ b/arch/alpha/oprofile/common.c
+@@ -12,6 +12,7 @@
+ #include <linux/smp.h>
+ #include <linux/errno.h>
+ #include <asm/ptrace.h>
++#include <asm/special_insns.h>
+ 
+ #include "op_impl.h"
+ 
+-- 
+1.7.9.5
+
diff --git a/patches/series b/patches/series
index 647319e..cbcb85d 100644
--- a/patches/series
+++ b/patches/series
@@ -37,3 +37,7 @@ MIPS-Fix-accessing-to-per-cpu-data-when-flushing-the-cache.patch
 openrisc-add-missing-header-inclusion.patch
 slab-mempolicy-always-use-local-policy-from-interrupt-context.patch
 8250_pci-fix-warnings-in-backport-of-Broadcom-TruManage-support.patch
+unicore32-select-generic-atomic64_t-support.patch
+UniCore32-bugfix-Remove-definitions-in-asm-bug.h-to-solve-difference-between-nat.patch
+UniCore32-bugfix-fix-mismatch-return-value-of-__xchg_bad_pointer.patch
+alpha-Fix-fall-out-from-disintegrating-asm-system.h.patch
diff --git a/patches/unicore32-select-generic-atomic64_t-support.patch b/patches/unicore32-select-generic-atomic64_t-support.patch
new file mode 100644
index 0000000..709f491
--- /dev/null
+++ b/patches/unicore32-select-generic-atomic64_t-support.patch
@@ -0,0 +1,35 @@
+From 82e54a6aaf8aec971fb16afa3a4404e238a1b98b Mon Sep 17 00:00:00 2001
+From: Fengguang Wu <fengguang.wu@intel.com>
+Date: Thu, 4 Oct 2012 17:11:23 -0700
+Subject: [PATCH] unicore32: select generic atomic64_t support
+
+commit 82e54a6aaf8aec971fb16afa3a4404e238a1b98b upstream.
+
+It's required for the core fs/namespace.c and many other basic features.
+
+Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
+Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
+Cc: "Eric W. Biederman" <ebiederm@xmission.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Zefan Li <lizefan@huawei.com>
+---
+ arch/unicore32/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
+index b0a4743..1e638e7 100644
+--- a/arch/unicore32/Kconfig
++++ b/arch/unicore32/Kconfig
+@@ -6,6 +6,7 @@ config UNICORE32
+ 	select HAVE_DMA_ATTRS
+ 	select HAVE_KERNEL_GZIP
+ 	select HAVE_KERNEL_BZIP2
++	select GENERIC_ATOMIC64
+ 	select HAVE_KERNEL_LZO
+ 	select HAVE_KERNEL_LZMA
+ 	select ARCH_HAVE_CUSTOM_GPIO_H
+-- 
+1.7.9.5
+