summaryrefslogtreecommitdiff
path: root/target/linux/uml
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-03-17 19:46:49 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-03-17 19:46:49 +0000
commita987d1aaa318b3ace1f8aa2eb69666d0592c1120 (patch)
tree807d4fd9840b042dd78af6dace808a1c452eddb8 /target/linux/uml
parent499f92c3dbd26c703671aa997b41bdfa2af7fe25 (diff)
downloadmtk-20170518-a987d1aaa318b3ace1f8aa2eb69666d0592c1120.zip
mtk-20170518-a987d1aaa318b3ace1f8aa2eb69666d0592c1120.tar.gz
mtk-20170518-a987d1aaa318b3ace1f8aa2eb69666d0592c1120.tar.bz2
uml: add support for 3.8 kernel
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 36077
Diffstat (limited to 'target/linux/uml')
-rw-r--r--target/linux/uml/patches-3.8/001-fix_make_headers_install.patch213
1 files changed, 213 insertions, 0 deletions
diff --git a/target/linux/uml/patches-3.8/001-fix_make_headers_install.patch b/target/linux/uml/patches-3.8/001-fix_make_headers_install.patch
new file mode 100644
index 0000000..0f872c0
--- /dev/null
+++ b/target/linux/uml/patches-3.8/001-fix_make_headers_install.patch
@@ -0,0 +1,213 @@
+From faec6b6c2cc0219e74569c13f581fc11d8f3fc57 Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <florian@openwrt.org>
+Date: Sun, 17 Mar 2013 20:12:10 +0100
+Subject: [PATCH] UM: fix make headers_install after UAPI header installation
+
+Commit 10b63956 (UAPI: Plumb the UAPI Kbuilds into the user
+header installation and checking) breaks UML make headers_install with
+the following:
+
+$ ARCH=um make headers_install
+ CHK include/generated/uapi/linux/version.h
+ UPD include/generated/uapi/linux/version.h
+ HOSTCC scripts/basic/fixdep
+ WRAP arch/um/include/generated/asm/bug.h
+[snip]
+ WRAP arch/um/include/generated/asm/trace_clock.h
+ SYSHDR arch/x86/syscalls/../include/generated/uapi/asm/unistd_32.h
+ SYSHDR arch/x86/syscalls/../include/generated/uapi/asm/unistd_64.h
+ SYSHDR arch/x86/syscalls/../include/generated/uapi/asm/unistd_x32.h
+ SYSTBL arch/x86/syscalls/../include/generated/asm/syscalls_32.h
+ HOSTCC scripts/unifdef
+Makefile:912: *** Headers not exportable for the um architecture. Stop.
+zsh: exit 2 ARCH=um make headers_install
+
+The reason for that is because the top-level Makefile does the
+following:
+ $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \
+ $(error Headers not exportable for the $(SRCARCH) architecture))
+
+we end-up in the else part of the $(if) statement because UML still uses
+the old path in arch/um/include/asm/Kbuild. This patch fixes the issue
+by moving the header files to be in arch/um/include/uapi/asm/ thus
+making headers_install (and other make targets checking for uapi) to
+succeed.
+
+Signed-off-by: Florian Fainelli <florian@openwrt.org>
+---
+Richard, this has been broken for 3.7+ onwards, if you want me to send
+you separate patches for 3.7 and 3.8 let me know. Thanks!
+
+ arch/um/include/{ => uapi}/asm/Kbuild | 0
+ arch/um/include/{ => uapi}/asm/a.out-core.h | 0
+ arch/um/include/{ => uapi}/asm/bugs.h | 0
+ arch/um/include/{ => uapi}/asm/cache.h | 0
+ arch/um/include/{ => uapi}/asm/common.lds.S | 0
+ arch/um/include/{ => uapi}/asm/dma.h | 0
+ arch/um/include/{ => uapi}/asm/fixmap.h | 0
+ arch/um/include/{ => uapi}/asm/irq.h | 0
+ arch/um/include/{ => uapi}/asm/irqflags.h | 0
+ arch/um/include/{ => uapi}/asm/kmap_types.h | 0
+ arch/um/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/um/include/{ => uapi}/asm/mmu.h | 0
+ arch/um/include/{ => uapi}/asm/mmu_context.h | 0
+ arch/um/include/{ => uapi}/asm/page.h | 0
+ arch/um/include/{ => uapi}/asm/pgalloc.h | 0
+ arch/um/include/{ => uapi}/asm/pgtable-2level.h | 0
+ arch/um/include/{ => uapi}/asm/pgtable-3level.h | 0
+ arch/um/include/{ => uapi}/asm/pgtable.h | 0
+ arch/um/include/{ => uapi}/asm/processor-generic.h | 0
+ arch/um/include/{ => uapi}/asm/ptrace-generic.h | 0
+ arch/um/include/{ => uapi}/asm/setup.h | 0
+ arch/um/include/{ => uapi}/asm/smp.h | 0
+ arch/um/include/{ => uapi}/asm/sysrq.h | 0
+ arch/um/include/{ => uapi}/asm/thread_info.h | 0
+ arch/um/include/{ => uapi}/asm/timex.h | 0
+ arch/um/include/{ => uapi}/asm/tlb.h | 0
+ arch/um/include/{ => uapi}/asm/tlbflush.h | 0
+ arch/um/include/{ => uapi}/asm/uaccess.h | 0
+ 28 files changed, 0 insertions(+), 0 deletions(-)
+ rename arch/um/include/{ => uapi}/asm/Kbuild (100%)
+ rename arch/um/include/{ => uapi}/asm/a.out-core.h (100%)
+ rename arch/um/include/{ => uapi}/asm/bugs.h (100%)
+ rename arch/um/include/{ => uapi}/asm/cache.h (100%)
+ rename arch/um/include/{ => uapi}/asm/common.lds.S (100%)
+ rename arch/um/include/{ => uapi}/asm/dma.h (100%)
+ rename arch/um/include/{ => uapi}/asm/fixmap.h (100%)
+ rename arch/um/include/{ => uapi}/asm/irq.h (100%)
+ rename arch/um/include/{ => uapi}/asm/irqflags.h (100%)
+ rename arch/um/include/{ => uapi}/asm/kmap_types.h (100%)
+ rename arch/um/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/um/include/{ => uapi}/asm/mmu.h (100%)
+ rename arch/um/include/{ => uapi}/asm/mmu_context.h (100%)
+ rename arch/um/include/{ => uapi}/asm/page.h (100%)
+ rename arch/um/include/{ => uapi}/asm/pgalloc.h (100%)
+ rename arch/um/include/{ => uapi}/asm/pgtable-2level.h (100%)
+ rename arch/um/include/{ => uapi}/asm/pgtable-3level.h (100%)
+ rename arch/um/include/{ => uapi}/asm/pgtable.h (100%)
+ rename arch/um/include/{ => uapi}/asm/processor-generic.h (100%)
+ rename arch/um/include/{ => uapi}/asm/ptrace-generic.h (100%)
+ rename arch/um/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/um/include/{ => uapi}/asm/smp.h (100%)
+ rename arch/um/include/{ => uapi}/asm/sysrq.h (100%)
+ rename arch/um/include/{ => uapi}/asm/thread_info.h (100%)
+ rename arch/um/include/{ => uapi}/asm/timex.h (100%)
+ rename arch/um/include/{ => uapi}/asm/tlb.h (100%)
+ rename arch/um/include/{ => uapi}/asm/tlbflush.h (100%)
+ rename arch/um/include/{ => uapi}/asm/uaccess.h (100%)
+
+diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/uapi/asm/Kbuild
+similarity index 100%
+rename from arch/um/include/asm/Kbuild
+rename to arch/um/include/uapi/asm/Kbuild
+diff --git a/arch/um/include/asm/a.out-core.h b/arch/um/include/uapi/asm/a.out-core.h
+similarity index 100%
+rename from arch/um/include/asm/a.out-core.h
+rename to arch/um/include/uapi/asm/a.out-core.h
+diff --git a/arch/um/include/asm/bugs.h b/arch/um/include/uapi/asm/bugs.h
+similarity index 100%
+rename from arch/um/include/asm/bugs.h
+rename to arch/um/include/uapi/asm/bugs.h
+diff --git a/arch/um/include/asm/cache.h b/arch/um/include/uapi/asm/cache.h
+similarity index 100%
+rename from arch/um/include/asm/cache.h
+rename to arch/um/include/uapi/asm/cache.h
+diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/uapi/asm/common.lds.S
+similarity index 100%
+rename from arch/um/include/asm/common.lds.S
+rename to arch/um/include/uapi/asm/common.lds.S
+diff --git a/arch/um/include/asm/dma.h b/arch/um/include/uapi/asm/dma.h
+similarity index 100%
+rename from arch/um/include/asm/dma.h
+rename to arch/um/include/uapi/asm/dma.h
+diff --git a/arch/um/include/asm/fixmap.h b/arch/um/include/uapi/asm/fixmap.h
+similarity index 100%
+rename from arch/um/include/asm/fixmap.h
+rename to arch/um/include/uapi/asm/fixmap.h
+diff --git a/arch/um/include/asm/irq.h b/arch/um/include/uapi/asm/irq.h
+similarity index 100%
+rename from arch/um/include/asm/irq.h
+rename to arch/um/include/uapi/asm/irq.h
+diff --git a/arch/um/include/asm/irqflags.h b/arch/um/include/uapi/asm/irqflags.h
+similarity index 100%
+rename from arch/um/include/asm/irqflags.h
+rename to arch/um/include/uapi/asm/irqflags.h
+diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/uapi/asm/kmap_types.h
+similarity index 100%
+rename from arch/um/include/asm/kmap_types.h
+rename to arch/um/include/uapi/asm/kmap_types.h
+diff --git a/arch/um/include/asm/kvm_para.h b/arch/um/include/uapi/asm/kvm_para.h
+similarity index 100%
+rename from arch/um/include/asm/kvm_para.h
+rename to arch/um/include/uapi/asm/kvm_para.h
+diff --git a/arch/um/include/asm/mmu.h b/arch/um/include/uapi/asm/mmu.h
+similarity index 100%
+rename from arch/um/include/asm/mmu.h
+rename to arch/um/include/uapi/asm/mmu.h
+diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/uapi/asm/mmu_context.h
+similarity index 100%
+rename from arch/um/include/asm/mmu_context.h
+rename to arch/um/include/uapi/asm/mmu_context.h
+diff --git a/arch/um/include/asm/page.h b/arch/um/include/uapi/asm/page.h
+similarity index 100%
+rename from arch/um/include/asm/page.h
+rename to arch/um/include/uapi/asm/page.h
+diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/uapi/asm/pgalloc.h
+similarity index 100%
+rename from arch/um/include/asm/pgalloc.h
+rename to arch/um/include/uapi/asm/pgalloc.h
+diff --git a/arch/um/include/asm/pgtable-2level.h b/arch/um/include/uapi/asm/pgtable-2level.h
+similarity index 100%
+rename from arch/um/include/asm/pgtable-2level.h
+rename to arch/um/include/uapi/asm/pgtable-2level.h
+diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/uapi/asm/pgtable-3level.h
+similarity index 100%
+rename from arch/um/include/asm/pgtable-3level.h
+rename to arch/um/include/uapi/asm/pgtable-3level.h
+diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/uapi/asm/pgtable.h
+similarity index 100%
+rename from arch/um/include/asm/pgtable.h
+rename to arch/um/include/uapi/asm/pgtable.h
+diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/uapi/asm/processor-generic.h
+similarity index 100%
+rename from arch/um/include/asm/processor-generic.h
+rename to arch/um/include/uapi/asm/processor-generic.h
+diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/uapi/asm/ptrace-generic.h
+similarity index 100%
+rename from arch/um/include/asm/ptrace-generic.h
+rename to arch/um/include/uapi/asm/ptrace-generic.h
+diff --git a/arch/um/include/asm/setup.h b/arch/um/include/uapi/asm/setup.h
+similarity index 100%
+rename from arch/um/include/asm/setup.h
+rename to arch/um/include/uapi/asm/setup.h
+diff --git a/arch/um/include/asm/smp.h b/arch/um/include/uapi/asm/smp.h
+similarity index 100%
+rename from arch/um/include/asm/smp.h
+rename to arch/um/include/uapi/asm/smp.h
+diff --git a/arch/um/include/asm/sysrq.h b/arch/um/include/uapi/asm/sysrq.h
+similarity index 100%
+rename from arch/um/include/asm/sysrq.h
+rename to arch/um/include/uapi/asm/sysrq.h
+diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/uapi/asm/thread_info.h
+similarity index 100%
+rename from arch/um/include/asm/thread_info.h
+rename to arch/um/include/uapi/asm/thread_info.h
+diff --git a/arch/um/include/asm/timex.h b/arch/um/include/uapi/asm/timex.h
+similarity index 100%
+rename from arch/um/include/asm/timex.h
+rename to arch/um/include/uapi/asm/timex.h
+diff --git a/arch/um/include/asm/tlb.h b/arch/um/include/uapi/asm/tlb.h
+similarity index 100%
+rename from arch/um/include/asm/tlb.h
+rename to arch/um/include/uapi/asm/tlb.h
+diff --git a/arch/um/include/asm/tlbflush.h b/arch/um/include/uapi/asm/tlbflush.h
+similarity index 100%
+rename from arch/um/include/asm/tlbflush.h
+rename to arch/um/include/uapi/asm/tlbflush.h
+diff --git a/arch/um/include/asm/uaccess.h b/arch/um/include/uapi/asm/uaccess.h
+similarity index 100%
+rename from arch/um/include/asm/uaccess.h
+rename to arch/um/include/uapi/asm/uaccess.h
+--
+1.7.10.4
+