diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-05-20 08:35:01 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-05-20 08:35:01 +0000 |
| commit | 09e1f836346580ba4ba7155bfe5019402f9030a0 (patch) | |
| tree | 735c56271a160c6e247b33c9947c314d5d4f3400 /target/linux/generic-2.6/patches-2.6.30 | |
| parent | cc226f469b16ac9811e2d7e6200bbf6bc17a692d (diff) | |
| download | upstream-09e1f836346580ba4ba7155bfe5019402f9030a0.tar.gz upstream-09e1f836346580ba4ba7155bfe5019402f9030a0.tar.bz2 upstream-09e1f836346580ba4ba7155bfe5019402f9030a0.zip | |
generic-2.6/2.6.30: gets rid of the length limitation on the name in the mips_machine stuff
SVN-Revision: 15930
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch index ceb61580b3..6799fdbb8b 100644 --- a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch +++ b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch @@ -1,8 +1,8 @@ --- /dev/null +++ b/include/asm-mips/mips_machine.h -@@ -0,0 +1,47 @@ +@@ -0,0 +1,46 @@ +/* -+ * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org> ++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published @@ -16,25 +16,24 @@ +#include <linux/init.h> +#include <linux/list.h> + -+#define MIPS_MACHINE_NAME_LEN 64 -+ +struct mips_machine { + unsigned long mach_type; + void (*mach_setup)(void); -+ unsigned char mach_name[MIPS_MACHINE_NAME_LEN]; ++ char *mach_name; + struct list_head list; +}; + +void mips_machine_register(struct mips_machine *) __init; +void mips_machine_setup(unsigned long machtype) __init; + -+extern unsigned char mips_machine_name[MIPS_MACHINE_NAME_LEN]; ++extern char *mips_machine_name; + +#define MIPS_MACHINE(_type, _name, _setup) \ ++static char machine_name_##_type[] __initdata = _name; \ +static struct mips_machine machine_##_type __initdata = \ +{ \ + .mach_type = _type, \ -+ .mach_name = _name, \ ++ .mach_name = machine_name_##_type, \ + .mach_setup = _setup, \ +}; \ + \ @@ -50,15 +49,16 @@ + --- /dev/null +++ b/arch/mips/kernel/mips_machine.c -@@ -0,0 +1,58 @@ +@@ -0,0 +1,70 @@ +/* -+ * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org> ++ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + * + */ ++#include <linux/mm.h> + +#include <asm/mips_machine.h> +#include <asm/bootinfo.h> @@ -66,7 +66,7 @@ +static struct list_head mips_machines __initdata = + LIST_HEAD_INIT(mips_machines); + -+unsigned char mips_machine_name[MIPS_MACHINE_NAME_LEN] = "Unknown"; ++char *mips_machine_name = "Unknown"; + +static struct mips_machine * __init mips_machine_find(unsigned long machtype) +{ @@ -99,9 +99,20 @@ + return; + } + -+ if (mach->mach_name[0]) -+ strncpy(mips_machine_name, mach->mach_name, -+ MIPS_MACHINE_NAME_LEN); ++ if (mach->mach_name) { ++ char *name; ++ unsigned int len; ++ ++ len = strlen(mach->mach_name); ++ name = kmalloc(len + 1, GFP_KERNEL); ++ if (name) { ++ strncpy(name, mach->mach_name,len); ++ name[len] = '\0'; ++ mips_machine_name = name; ++ } else { ++ printk(KERN_WARNING "MIPS: no memory for machine_name\n"); ++ } ++ } + + printk(KERN_INFO "MIPS: machine is %s\n", mips_machine_name); + |