patches in git now - remove
svn path=/dists/trunk/linux-2.6/; revision=11653
This commit is contained in:
parent
2a614f8c00
commit
4777988ed2
|
@ -1,40 +0,0 @@
|
|||
From cb55ed7d958cf4abb58dd1d6e46e09447b5694b0 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
|
||||
Date: Mon, 12 May 2008 17:49:19 +0400
|
||||
Subject: [PATCH 1/1] [MIPS] Export empty_zero_page as a GPL symbol
|
||||
|
||||
The empty_zero_page symbol is needed for the ext4 driver and
|
||||
should therefore be exported. This fixes the following error
|
||||
reported by Martin Michlmayr:
|
||||
|
||||
>>>>>>>
|
||||
|
||||
MODPOST 1516 modules
|
||||
ERROR: "empty_zero_page" [fs/ext4/ext4dev.ko] undefined!
|
||||
|
||||
>>>>>>
|
||||
|
||||
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
|
||||
---
|
||||
arch/mips/mm/init.c | 5 ++++-
|
||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
|
||||
index ecd562d..618a418 100644
|
||||
--- a/arch/mips/mm/init.c
|
||||
+++ b/arch/mips/mm/init.c
|
||||
@@ -70,7 +70,10 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
|
||||
* any price. Since page is never written to after the initialization we
|
||||
* don't have to care about aliases on other CPUs.
|
||||
*/
|
||||
-unsigned long empty_zero_page, zero_page_mask;
|
||||
+unsigned long empty_zero_page;
|
||||
+EXPORT_SYMBOL_GPL(empty_zero_page);
|
||||
+
|
||||
+unsigned long zero_page_mask;
|
||||
|
||||
/*
|
||||
* Not static inline because used by IP27 special magic initialization code
|
||||
--
|
||||
1.5.3
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
On Wed, May 28, 2008 at 05:10:25PM +0200, Martin Michlmayr wrote:
|
||||
> * Thomas Bogendoerfer <tsbogend@alpha.franken.de> [2008-05-28 10:50]:
|
||||
> > I didn't fix the problems above. The change to traps.c only fixes
|
||||
> > traps.c for 64bit builds and it's a totally different issue. Looking
|
||||
> > at the warning/errors someone needs to fix some data types and use
|
||||
> > CKSEG0ADDR(). I don't have the hardware, so I could only provide an
|
||||
> > untested patch, if no one else steps forward...
|
||||
>
|
||||
> QEMU emulates Malta, so I (or someone else here) should be able to
|
||||
> test the patch.
|
||||
|
||||
|
||||
Fix 64bit Malta by using CKSEG0ADDR and correct casts
|
||||
|
||||
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
|
||||
---
|
||||
|
||||
arch/mips/mips-boards/generic/amon.c | 4 ++--
|
||||
include/asm-mips/gic.h | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mips-boards/generic/amon.c
|
||||
index b7633fd..96236bf 100644
|
||||
--- a/arch/mips/mips-boards/generic/amon.c
|
||||
+++ b/arch/mips/mips-boards/generic/amon.c
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
int amon_cpu_avail(int cpu)
|
||||
{
|
||||
- struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH);
|
||||
+ struct cpulaunch *launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH);
|
||||
|
||||
if (cpu < 0 || cpu >= NCPULAUNCH) {
|
||||
pr_debug("avail: cpu%d is out of range\n", cpu);
|
||||
@@ -53,7 +53,7 @@ void amon_cpu_start(int cpu,
|
||||
unsigned long gp, unsigned long a0)
|
||||
{
|
||||
volatile struct cpulaunch *launch =
|
||||
- (struct cpulaunch *)KSEG0ADDR(CPULAUNCH);
|
||||
+ (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH);
|
||||
|
||||
if (!amon_cpu_avail(cpu))
|
||||
return;
|
||||
diff --git a/include/asm-mips/gic.h b/include/asm-mips/gic.h
|
||||
index 3a492f2..954807d 100644
|
||||
--- a/include/asm-mips/gic.h
|
||||
+++ b/include/asm-mips/gic.h
|
||||
@@ -24,8 +24,8 @@
|
||||
|
||||
#define MSK(n) ((1 << (n)) - 1)
|
||||
#define REG32(addr) (*(volatile unsigned int *) (addr))
|
||||
-#define REG(base, offs) REG32((unsigned int)(base) + offs##_##OFS)
|
||||
-#define REGP(base, phys) REG32((unsigned int)(base) + (phys))
|
||||
+#define REG(base, offs) REG32((unsigned long)(base) + offs##_##OFS)
|
||||
+#define REGP(base, phys) REG32((unsigned long)(base) + (phys))
|
||||
|
||||
/* Accessors */
|
||||
#define GIC_REG(segment, offset) \
|
||||
|
||||
|
||||
--
|
||||
Crap can work. Given enough thrust pigs will fly, but it's not necessary a
|
||||
good idea. [ RFC1925, 2.3 ]
|
|
@ -1,45 +0,0 @@
|
|||
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
|
||||
Date: Mon, 12 May 2008 15:58:48 +0000 (+0200)
|
||||
Subject: [MIPS] Fix check for valid stack pointer during backtrace
|
||||
X-Git-Tag: linux-2.6.26-rc3~2
|
||||
X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=777f5acbe483e96c0b96f54446423064da82d0b7
|
||||
|
||||
[MIPS] Fix check for valid stack pointer during backtrace
|
||||
|
||||
The newly added check for valid stack pointer address breaks at least for
|
||||
64bit kernels. Use __get_user() for accessing stack content to avoid crashes,
|
||||
when doing the backtrace.
|
||||
|
||||
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
|
||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
||||
---
|
||||
|
||||
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
|
||||
index cb8b0e2..f9165d1 100644
|
||||
--- a/arch/mips/kernel/traps.c
|
||||
+++ b/arch/mips/kernel/traps.c
|
||||
@@ -88,15 +88,17 @@ static void show_raw_backtrace(unsigned long reg29)
|
||||
#ifdef CONFIG_KALLSYMS
|
||||
printk("\n");
|
||||
#endif
|
||||
-#define IS_KVA01(a) ((((unsigned int)a) & 0xc0000000) == 0x80000000)
|
||||
- if (IS_KVA01(sp)) {
|
||||
- while (!kstack_end(sp)) {
|
||||
- addr = *sp++;
|
||||
- if (__kernel_text_address(addr))
|
||||
- print_ip_sym(addr);
|
||||
+ while (!kstack_end(sp)) {
|
||||
+ unsigned long __user *p =
|
||||
+ (unsigned long __user *)(unsigned long)sp++;
|
||||
+ if (__get_user(addr, p)) {
|
||||
+ printk(" (Bad stack address)");
|
||||
+ break;
|
||||
}
|
||||
- printk("\n");
|
||||
+ if (__kernel_text_address(addr))
|
||||
+ print_ip_sym(addr);
|
||||
}
|
||||
+ printk("\n");
|
||||
}
|
||||
|
||||
#ifdef CONFIG_KALLSYMS
|
|
@ -43,6 +43,3 @@
|
|||
+ bugfix/fix-hifn_795X-divdi3.patch
|
||||
+ bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch
|
||||
+ features/all/0001-iwlwifi-Set-monitor-mode-for-3945.patch
|
||||
+ bugfix/mips/ext4-build-fix.patch
|
||||
+ bugfix/mips/malta-build-fix.patch
|
||||
#+ bugfix/mips/traps-build-fix.patch
|
||||
|
|
Loading…
Reference in New Issue