From b38a0757ffce4d386da2dca798cc04b21c47a876 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 30 Jul 2012 08:31:11 +0200 Subject: update patches for 3.5 --- .../kernel-headers/patches/3.5/etrax-header.patch | 55 +++++++++++----------- 1 file changed, 27 insertions(+), 28 deletions(-) (limited to 'toolchain') diff --git a/toolchain/kernel-headers/patches/3.5/etrax-header.patch b/toolchain/kernel-headers/patches/3.5/etrax-header.patch index 559c0f322..03d19a9ab 100644 --- a/toolchain/kernel-headers/patches/3.5/etrax-header.patch +++ b/toolchain/kernel-headers/patches/3.5/etrax-header.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.4.4/arch/cris/include/arch-v10/arch/Kbuild ---- linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/arch-v10/arch/Kbuild 2012-07-18 07:38:39.000000000 +0200 +diff -Nur linux-3.5.orig//arch/cris/include/arch-v10/arch/Kbuild linux-3.5/arch/cris/include/arch-v10/arch/Kbuild +--- linux-3.5.orig//arch/cris/include/arch-v10/arch/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/arch/cris/include/arch-v10/arch/Kbuild 2012-07-27 14:01:25.000000000 +0200 @@ -1,4 +1,10 @@ +header-y += dma.h +header-y += io_interface_mux.h @@ -12,9 +12,9 @@ diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v10/arch/Kbuild linux-3.4.4/ar +header-y += page.h +header-y += ptrace.h +header-y += system.h -diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.4.4/arch/cris/include/arch-v32/arch/Kbuild ---- linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/arch-v32/arch/Kbuild 2012-07-18 07:38:26.000000000 +0200 +diff -Nur linux-3.5.orig//arch/cris/include/arch-v32/arch/Kbuild linux-3.5/arch/cris/include/arch-v32/arch/Kbuild +--- linux-3.5.orig//arch/cris/include/arch-v32/arch/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/arch/cris/include/arch-v32/arch/Kbuild 2012-07-27 14:01:25.000000000 +0200 @@ -1,2 +1,7 @@ header-y += user.h header-y += cryptocop.h @@ -23,29 +23,27 @@ diff -Nur linux-3.4.4.orig/arch/cris/include/arch-v32/arch/Kbuild linux-3.4.4/ar +header-y += ptrace.h +header-y += system.h + -diff -Nur linux-3.4.4.orig/arch/cris/include/asm/Kbuild linux-3.4.4/arch/cris/include/asm/Kbuild ---- linux-3.4.4.orig/arch/cris/include/asm/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/asm/Kbuild 2012-07-18 07:38:03.000000000 +0200 -@@ -1,10 +1,13 @@ +diff -Nur linux-3.5.orig//arch/cris/include/asm/Kbuild linux-3.5/arch/cris/include/asm/Kbuild +--- linux-3.5.orig//arch/cris/include/asm/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/arch/cris/include/asm/Kbuild 2012-07-27 14:02:20.000000000 +0200 +@@ -1,9 +1,12 @@ include include/asm-generic/Kbuild.asm -header-y += arch-v10/ -header-y += arch-v32/ -- +header-y += ../arch-v10/arch/ +header-y += ../arch-v32/arch/ -+ + +header-y += elf.h header-y += ethernet.h header-y += etraxgpio.h header-y += rs485.h - header-y += rtc.h header-y += sync_serial.h +header-y += page.h +header-y += user.h -diff -Nur linux-3.4.4.orig/arch/cris/include/asm/posix_types.h linux-3.4.4/arch/cris/include/asm/posix_types.h ---- linux-3.4.4.orig/arch/cris/include/asm/posix_types.h 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/arch/cris/include/asm/posix_types.h 2012-07-18 17:10:45.000000000 +0200 +diff -Nur linux-3.5.orig//arch/cris/include/asm/posix_types.h linux-3.5/arch/cris/include/asm/posix_types.h +--- linux-3.5.orig//arch/cris/include/asm/posix_types.h 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/arch/cris/include/asm/posix_types.h 2012-07-27 14:01:25.000000000 +0200 @@ -6,6 +6,7 @@ #ifndef __ARCH_CRIS_POSIX_TYPES_H #define __ARCH_CRIS_POSIX_TYPES_H @@ -54,17 +52,17 @@ diff -Nur linux-3.4.4.orig/arch/cris/include/asm/posix_types.h linux-3.4.4/arch/ /* * This file is generally used by user-level software, so you need to * be a little careful about namespace pollution etc. Also, we cannot -@@ -33,4 +34,6 @@ - typedef unsigned short __kernel_old_dev_t; - #define __kernel_old_dev_t __kernel_old_dev_t +@@ -32,4 +33,6 @@ + + #include +#include + #endif /* __ARCH_CRIS_POSIX_TYPES_H */ -diff -Nur linux-3.4.4.orig/include/asm-generic/Kbuild linux-3.4.4/include/asm-generic/Kbuild ---- linux-3.4.4.orig/include/asm-generic/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/include/asm-generic/Kbuild 2012-07-18 07:38:03.000000000 +0200 -@@ -3,14 +3,17 @@ +diff -Nur linux-3.5.orig//include/asm-generic/Kbuild linux-3.5/include/asm-generic/Kbuild +--- linux-3.5.orig//include/asm-generic/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/include/asm-generic/Kbuild 2012-07-27 14:03:16.000000000 +0200 +@@ -3,15 +3,18 @@ header-y += errno-base.h header-y += errno.h header-y += fcntl.h @@ -74,6 +72,7 @@ diff -Nur linux-3.4.4.orig/include/asm-generic/Kbuild linux-3.4.4/include/asm-ge header-y += ioctl.h header-y += ioctls.h header-y += ipcbuf.h + header-y += kvm_para.h +header-y += memory_model.h header-y += mman-common.h header-y += mman.h @@ -82,14 +81,14 @@ diff -Nur linux-3.4.4.orig/include/asm-generic/Kbuild linux-3.4.4/include/asm-ge header-y += param.h header-y += poll.h header-y += posix_types.h -diff -Nur linux-3.4.4.orig/include/linux/Kbuild linux-3.4.4/include/linux/Kbuild ---- linux-3.4.4.orig/include/linux/Kbuild 2012-06-22 20:37:50.000000000 +0200 -+++ linux-3.4.4/include/linux/Kbuild 2012-07-18 07:38:03.000000000 +0200 -@@ -380,6 +380,7 @@ +diff -Nur linux-3.5.orig//include/linux/Kbuild linux-3.5/include/linux/Kbuild +--- linux-3.5.orig//include/linux/Kbuild 2012-07-21 22:58:29.000000000 +0200 ++++ linux-3.5/include/linux/Kbuild 2012-07-27 14:01:25.000000000 +0200 +@@ -382,6 +382,7 @@ header-y += un.h header-y += unistd.h header-y += usbdevice_fs.h +header-y += user.h header-y += utime.h header-y += utsname.h - header-y += uvcvideo.h + header-y += uuid.h -- cgit v1.2.3