1 files changed, 49 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches-0.9.30/180-fix_kernel_types_with_recent_kernel.patch b/toolchain/uClibc/patches-0.9.30/180-fix_kernel_types_with_recent_kernel.patch
new file mode 100644
index 0000000000..89c60fee36
--- /dev/null
+++ b/toolchain/uClibc/patches-0.9.30/180-fix_kernel_types_with_recent_kernel.patch
@@ -0,0 +1,49 @@
+From df180f43dd9fc651ac760e7fe4a4dcf9e6dd42f1 Mon Sep 17 00:00:00 2001
+From: kraj <kraj@69ca8d6d-28ef-0310-b511-8ec308f3f277>
+Date: Tue, 23 Dec 2008 09:04:50 +0000
+Subject: [PATCH] These defines needs to be considered after recent linux kernel combined i386 and x86_64 into x86
+
+git-svn-id: svn+ssh://uclibc.org/svn/trunk/uClibc@24515 69ca8d6d-28ef-0310-b511-8ec308f3f277
+---
+ libc/sysdeps/linux/i386/bits/kernel_types.h |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
+index 6609dd3..8641a48 100644
+--- a/libc/sysdeps/linux/i386/bits/kernel_types.h
++++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
+@@ -7,10 +7,14 @@
+ 
+ /* a hack for compiling a 32 bit user space with 64 bit
+  * kernel on x86_64  */
+-#if !defined(__ARCH_I386_POSIX_TYPES_H) && !defined(_ASM_X86_64_POSIX_TYPES_H)
++#if !defined(__ARCH_I386_POSIX_TYPES_H) && \
++    !defined(_ASM_X86_64_POSIX_TYPES_H) && \
++    !defined(_ASM_X86_POSIX_TYPES_32_H) && \
++    !defined(_ASM_X86_POSIX_TYPES_64_H)
+ #define _ASM_X86_64_POSIX_TYPES_H
+ #define __ARCH_I386_POSIX_TYPES_H
+-
++#define _ASM_X86_POSIX_TYPES_32_H
++#define _ASM_X86_POSIX_TYPES_64_H
+ typedef unsigned short	__kernel_dev_t;
+ typedef unsigned long	__kernel_ino_t;
+ typedef unsigned short	__kernel_mode_t;
+-- 
+1.5.6.5
+
+diff -ruN uClibc-0.9.30-old/libc/sysdeps/linux/x86_64/bits/kernel_types.h uClibc-0.9.30-new/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+--- uClibc-0.9.30-old/libc/sysdeps/linux/x86_64/bits/kernel_types.h	2008-07-23 13:23:36.000000000 +0200
++++ uClibc-0.9.30-new/libc/sysdeps/linux/x86_64/bits/kernel_types.h	2009-01-21 16:33:27.000000000 +0100
+@@ -4,8 +4,10 @@
+  * our private content, and not the kernel header, will win.
+  *  -Erik
+  */
+-#ifndef _ASM_X86_64_POSIX_TYPES_H
++#if !defined(_ASM_X86_64_POSIX_TYPES_H) && \
++    !defined(_ASM_X86_POSIX_TYPES_64_H)
+ #define _ASM_X86_64_POSIX_TYPES_H
++#define _ASM_X86_POSIX_TYPES_64_H
+ 
+ typedef unsigned long	__kernel_dev_t;
+ typedef unsigned long	__kernel_ino_t;