diff options
Diffstat (limited to 'sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch')
| -rw-r--r-- | sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch b/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch index cd3bec0..ad6089d 100644 --- a/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch +++ b/sys-kernel/glendix-sources/files/glendix_2.6.31.6.patch @@ -1,6 +1,6 @@ -diff -Nur ../linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h ./arch/x86/include/asm/irq_vectors.h ---- linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h 2009-11-27 08:51:39.000000000 +0100 +diff -Nur a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h +--- a/arch/x86/include/asm/irq_vectors.h 2009-11-10 01:32:31.000000000 +0100 ++++ b/arch/x86/include/asm/irq_vectors.h 2009-11-27 08:51:39.000000000 +0100 @@ -39,6 +39,7 @@ #else # define IA32_SYSCALL_VECTOR 0x80 @@ -9,18 +9,18 @@ diff -Nur ../linux-2.6.31.6/arch/x86/include/asm/irq_vectors.h ./arch/x86/includ /* * Reserve the lowest usable priority level 0x20 - 0x2f for triggering -diff -Nur ../linux-2.6.31.6/arch/x86/Kconfig ./arch/x86/Kconfig ---- linux-2.6.31.6/arch/x86/Kconfig 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/Kconfig 2009-11-27 08:49:55.000000000 +0100 +diff -Nur a/arch/x86/Kconfig b/arch/x86/Kconfig +--- a/arch/x86/Kconfig 2009-11-10 01:32:31.000000000 +0100 ++++ b/arch/x86/Kconfig 2009-11-27 08:49:55.000000000 +0100 @@ -2095,3 +2095,5 @@ source "arch/x86/kvm/Kconfig" source "lib/Kconfig" + +source "plan9/Kconfig" -diff -Nur ../linux-2.6.31.6/arch/x86/kernel/entry_32.S ./arch/x86/kernel/entry_32.S ---- linux-2.6.31.6/arch/x86/kernel/entry_32.S 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/kernel/entry_32.S 2009-11-27 08:49:55.000000000 +0100 +diff -Nur a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S +--- a/arch/x86/kernel/entry_32.S 2009-11-10 01:32:31.000000000 +0100 ++++ b/arch/x86/kernel/entry_32.S 2009-11-27 08:49:55.000000000 +0100 @@ -513,6 +513,20 @@ PTGS_TO_GS_EX ENDPROC(ia32_sysenter_target) @@ -51,9 +51,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/entry_32.S ./arch/x86/kernel/entry_3 syscall_table_size=(.-sys_call_table) /* -diff -Nur ../linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S ./arch/x86/kernel/plan9_syscall_table.S ---- linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/arch/x86/kernel/plan9_syscall_table.S b/arch/x86/kernel/plan9_syscall_table.S +--- a/arch/x86/kernel/plan9_syscall_table.S 1970-01-01 01:00:00.000000000 +0100 ++++ b/arch/x86/kernel/plan9_syscall_table.S 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,54 @@ +ENTRY(plan9_syscall_table) + .long sys_plan9_unimplemented /* 0 */ @@ -109,9 +109,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/plan9_syscall_table.S ./arch/x86/ker + .long sys_plan9_pread /* 50 */ + .long sys_plan9_pwrite +END(plan9_syscall_table) -diff -Nur ../linux-2.6.31.6/arch/x86/kernel/traps.c ./arch/x86/kernel/traps.c ---- linux-2.6.31.6/arch/x86/kernel/traps.c 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/arch/x86/kernel/traps.c 2009-11-27 08:56:53.000000000 +0100 +diff -Nur a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c +--- a/arch/x86/kernel/traps.c 2009-11-10 01:32:31.000000000 +0100 ++++ b/arch/x86/kernel/traps.c 2009-11-27 08:56:53.000000000 +0100 @@ -67,6 +67,7 @@ #include <asm/traps.h> @@ -131,9 +131,9 @@ diff -Nur ../linux-2.6.31.6/arch/x86/kernel/traps.c ./arch/x86/kernel/traps.c #endif /* -diff -Nur ../linux-2.6.31.6/.config ./.config ---- linux-2.6.31.6/.config 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/.config 2009-11-27 10:24:02.000000000 +0100 +diff -Nur a/.config b/.config +--- a/.config 1970-01-01 01:00:00.000000000 +0100 ++++ b/.config 2009-11-27 10:24:02.000000000 +0100 @@ -0,0 +1,2184 @@ +# +# Automatically generated make config: don't edit @@ -2319,9 +2319,9 @@ diff -Nur ../linux-2.6.31.6/.config ./.config +# Plan 9 support +# +CONFIG_BINFMT_PLAN9=y -diff -Nur ../linux-2.6.31.6/Documentation/lguest/lguest.c ./Documentation/lguest/lguest.c ---- linux-2.6.31.6/Documentation/lguest/lguest.c 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/Documentation/lguest/lguest.c 2009-11-27 10:21:54.000000000 +0100 +diff -Nur a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c +--- a/Documentation/lguest/lguest.c 2009-11-10 01:32:31.000000000 +0100 ++++ b/Documentation/lguest/lguest.c 2009-11-27 10:21:54.000000000 +0100 @@ -18,7 +18,6 @@ #include <sys/types.h> #include <sys/stat.h> @@ -2330,9 +2330,9 @@ diff -Nur ../linux-2.6.31.6/Documentation/lguest/lguest.c ./Documentation/lguest #include <fcntl.h> #include <stdbool.h> #include <errno.h> -diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.c ./fs/binfmt_plan9.c ---- linux-2.6.31.6/fs/binfmt_plan9.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/fs/binfmt_plan9.c 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/fs/binfmt_plan9.c b/fs/binfmt_plan9.c +--- a/fs/binfmt_plan9.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/fs/binfmt_plan9.c 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,227 @@ +/* + * Binary loader for Plan 9's a.out executable format @@ -2561,9 +2561,9 @@ diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.c ./fs/binfmt_plan9.c +MODULE_AUTHOR ("Anant Narayanan <anant@kix.in>"); +MODULE_DESCRIPTION ("Binary loader for Plan9's a.out executable format"); + -diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.h ./fs/binfmt_plan9.h ---- linux-2.6.31.6/fs/binfmt_plan9.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/fs/binfmt_plan9.h 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/fs/binfmt_plan9.h b/fs/binfmt_plan9.h +--- a/fs/binfmt_plan9.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/fs/binfmt_plan9.h 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,43 @@ +/* + * Binary loader for Plan 9's a.out executable format @@ -2608,9 +2608,9 @@ diff -Nur ../linux-2.6.31.6/fs/binfmt_plan9.h ./fs/binfmt_plan9.h +#define TXT_ADDR(x) HDR_SIZE + x.text /* TEXT Address */ +#define DAT_ADDR(x) STR_ADDR + PAGE_ALIGN(TXT_ADDR(x)) /* DATA & BSS */ + -diff -Nur ../linux-2.6.31.6/fs/Makefile ./fs/Makefile ---- linux-2.6.31.6/fs/Makefile 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/fs/Makefile 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/fs/Makefile b/fs/Makefile +--- a/fs/Makefile 2009-11-10 01:32:31.000000000 +0100 ++++ b/fs/Makefile 2009-11-27 08:50:19.000000000 +0100 @@ -37,6 +37,8 @@ obj-$(CONFIG_BINFMT_EM86) += binfmt_em86.o obj-$(CONFIG_BINFMT_MISC) += binfmt_misc.o @@ -2620,9 +2620,9 @@ diff -Nur ../linux-2.6.31.6/fs/Makefile ./fs/Makefile # binfmt_script is always there obj-y += binfmt_script.o -diff -Nur ../linux-2.6.31.6/Makefile ./Makefile ---- linux-2.6.31.6/Makefile 2009-11-10 01:32:31.000000000 +0100 -+++ linux-2.6.31.6/Makefile 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/Makefile b/Makefile +--- a/Makefile 2009-11-10 01:32:31.000000000 +0100 ++++ b/Makefile 2009-11-27 08:50:19.000000000 +0100 @@ -639,7 +639,7 @@ @@ -2632,9 +2632,9 @@ diff -Nur ../linux-2.6.31.6/Makefile ./Makefile vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -Nur ../linux-2.6.31.6/plan9/devcons.c ./plan9/devcons.c ---- linux-2.6.31.6/plan9/devcons.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/plan9/devcons.c 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/plan9/devcons.c b/plan9/devcons.c +--- a/plan9/devcons.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/plan9/devcons.c 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,65 @@ +/** + * Plan 9 '#c' emulation. @@ -2701,9 +2701,9 @@ diff -Nur ../linux-2.6.31.6/plan9/devcons.c ./plan9/devcons.c + +module_init(cons_init); +module_exit(cons_exit); -diff -Nur ../linux-2.6.31.6/plan9/Kconfig ./plan9/Kconfig ---- linux-2.6.31.6/plan9/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/plan9/Kconfig 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/plan9/Kconfig b/plan9/Kconfig +--- a/plan9/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ b/plan9/Kconfig 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,8 @@ +menu "Plan 9 support" + @@ -2713,9 +2713,9 @@ diff -Nur ../linux-2.6.31.6/plan9/Kconfig ./plan9/Kconfig + This will compile support for Plan 9 a.out (to be used with Glendix) + +endmenu -diff -Nur ../linux-2.6.31.6/plan9/Makefile ./plan9/Makefile ---- linux-2.6.31.6/plan9/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/plan9/Makefile 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/plan9/Makefile b/plan9/Makefile +--- a/plan9/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ b/plan9/Makefile 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,8 @@ +# +# Makefile for Plan 9 system support @@ -2725,9 +2725,9 @@ diff -Nur ../linux-2.6.31.6/plan9/Makefile ./plan9/Makefile + +obj-$(CONFIG_BINFMT_PLAN9) += syscalls.o devcons.o + -diff -Nur ../linux-2.6.31.6/plan9/p9_constants.h ./plan9/p9_constants.h ---- linux-2.6.31.6/plan9/p9_constants.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/plan9/p9_constants.h 2009-11-27 08:50:19.000000000 +0100 +diff -Nur a/plan9/p9_constants.h b/plan9/p9_constants.h +--- a/plan9/p9_constants.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/plan9/p9_constants.h 2009-11-27 08:50:19.000000000 +0100 @@ -0,0 +1,18 @@ +/* + * Plan 9 constants @@ -2747,9 +2747,9 @@ diff -Nur ../linux-2.6.31.6/plan9/p9_constants.h ./plan9/p9_constants.h +#define RFREND 8192 +#define RFNOMNT 16384 + -diff -Nur ../linux-2.6.31.6/plan9/syscalls.c ./plan9/syscalls.c ---- linux-2.6.31.6/plan9/syscalls.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.31.6/plan9/syscalls.c 2009-11-27 09:50:45.000000000 +0100 +diff -Nur a/plan9/syscalls.c b/plan9/syscalls.c +--- a/plan9/syscalls.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/plan9/syscalls.c 2009-11-27 09:50:45.000000000 +0100 @@ -0,0 +1,378 @@ +/* + * Copyright (C) 2008 Anant Narayanan <anant@kix.in> |