summaryrefslogtreecommitdiff
path: root/toolchain/kernel-headers/linux-libc-headers-2.6.9-nios2nommu.patch.conditional
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-01-10 02:16:11 +0000
committerMike Frysinger <vapier@gentoo.org>2006-01-10 02:16:11 +0000
commit5ebb4e6ba553bfc7ca66349a45d6ad187280dcbd (patch)
treec6227029679bd443366a29856477f4409d396d22 /toolchain/kernel-headers/linux-libc-headers-2.6.9-nios2nommu.patch.conditional
parent239c6ed2e179c4345700a929c8852be9332b331c (diff)
Thomas Chou says in bug 618: clean up nios2 headers and add support for 2.6.11
Diffstat (limited to 'toolchain/kernel-headers/linux-libc-headers-2.6.9-nios2nommu.patch.conditional')
-rw-r--r--toolchain/kernel-headers/linux-libc-headers-2.6.9-nios2nommu.patch.conditional532
1 files changed, 266 insertions, 266 deletions
diff --git a/toolchain/kernel-headers/linux-libc-headers-2.6.9-nios2nommu.patch.conditional b/toolchain/kernel-headers/linux-libc-headers-2.6.9-nios2nommu.patch.conditional
index 820868ffb..b828b3bb3 100644
--- a/toolchain/kernel-headers/linux-libc-headers-2.6.9-nios2nommu.patch.conditional
+++ b/toolchain/kernel-headers/linux-libc-headers-2.6.9-nios2nommu.patch.conditional
@@ -1,5 +1,5 @@
---- linux-libc-headers-2.6.9.1/include/asm-generic/bitops.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/bitops.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-generic/bitops.h
++++ linux/include/asm-generic/bitops.h
@@ -0,0 +1,81 @@
+#ifndef _ASM_GENERIC_BITOPS_H_
+#define _ASM_GENERIC_BITOPS_H_
@@ -82,8 +82,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_GENERIC_BITOPS_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/bug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/bug.h 2005-05-18 20:34:55.000000000 +0200
+--- linux/include/asm-generic/bug.h
++++ linux/include/asm-generic/bug.h
@@ -0,0 +1,34 @@
+#ifndef _ASM_GENERIC_BUG_H
+#define _ASM_GENERIC_BUG_H
@@ -119,8 +119,8 @@
+#endif
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-generic/cpumask.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/cpumask.h 2005-05-18 20:35:01.000000000 +0200
+--- linux/include/asm-generic/cpumask.h
++++ linux/include/asm-generic/cpumask.h
@@ -0,0 +1,40 @@
+#ifndef __ASM_GENERIC_CPUMASK_H
+#define __ASM_GENERIC_CPUMASK_H
@@ -162,8 +162,8 @@
+#endif
+
+#endif /* __ASM_GENERIC_CPUMASK_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/cpumask_arith.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/cpumask_arith.h 2004-01-25 14:35:16.000000000 +0100
+--- linux/include/asm-generic/cpumask_arith.h
++++ linux/include/asm-generic/cpumask_arith.h
@@ -0,0 +1,49 @@
+#ifndef __ASM_GENERIC_CPUMASK_ARITH_H
+#define __ASM_GENERIC_CPUMASK_ARITH_H
@@ -214,8 +214,8 @@
+#define next_cpu(cpu, map) find_next_bit(&(map), NR_CPUS, cpu + 1)
+
+#endif /* __ASM_GENERIC_CPUMASK_ARITH_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/cpumask_array.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/cpumask_array.h 2004-01-25 14:35:16.000000000 +0100
+--- linux/include/asm-generic/cpumask_array.h
++++ linux/include/asm-generic/cpumask_array.h
@@ -0,0 +1,54 @@
+#ifndef __ASM_GENERIC_CPUMASK_ARRAY_H
+#define __ASM_GENERIC_CPUMASK_ARRAY_H
@@ -271,8 +271,8 @@
+#define CPU_MASK_NONE { {[0 ... CPU_ARRAY_SIZE-1] = 0UL} }
+
+#endif /* __ASM_GENERIC_CPUMASK_ARRAY_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/cpumask_const_reference.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/cpumask_const_reference.h 2004-01-16 16:00:38.000000000 +0100
+--- linux/include/asm-generic/cpumask_const_reference.h
++++ linux/include/asm-generic/cpumask_const_reference.h
@@ -0,0 +1,29 @@
+#ifndef __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H
+#define __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H
@@ -303,8 +303,8 @@
+#define any_online_cpu_const(map) any_online_cpu(*(map).val)
+
+#endif /* __ASM_GENERIC_CPUMASK_CONST_REFERENCE_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/cpumask_const_value.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/cpumask_const_value.h 2004-01-25 14:35:16.000000000 +0100
+--- linux/include/asm-generic/cpumask_const_value.h
++++ linux/include/asm-generic/cpumask_const_value.h
@@ -0,0 +1,21 @@
+#ifndef __ASM_GENERIC_CPUMASK_CONST_VALUE_H
+#define __ASM_GENERIC_CPUMASK_CONST_VALUE_H
@@ -327,8 +327,8 @@
+#define any_online_cpu_const(map) any_online_cpu(map)
+
+#endif /* __ASM_GENERIC_CPUMASK_CONST_VALUE_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/cpumask_up.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/cpumask_up.h 2004-01-25 14:35:16.000000000 +0100
+--- linux/include/asm-generic/cpumask_up.h
++++ linux/include/asm-generic/cpumask_up.h
@@ -0,0 +1,59 @@
+#ifndef __ASM_GENERIC_CPUMASK_UP_H
+#define __ASM_GENERIC_CPUMASK_UP_H
@@ -389,8 +389,8 @@
+#define CPU_MASK_NONE 0UL
+
+#endif /* __ASM_GENERIC_CPUMASK_UP_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/div64.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/div64.h 2004-01-16 16:00:38.000000000 +0100
+--- linux/include/asm-generic/div64.h
++++ linux/include/asm-generic/div64.h
@@ -0,0 +1,58 @@
+#ifndef _ASM_GENERIC_DIV64_H
+#define _ASM_GENERIC_DIV64_H
@@ -450,8 +450,8 @@
+#endif /* BITS_PER_LONG */
+
+#endif /* _ASM_GENERIC_DIV64_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/dma-mapping-broken.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/dma-mapping-broken.h 2004-05-01 15:23:26.000000000 +0200
+--- linux/include/asm-generic/dma-mapping-broken.h
++++ linux/include/asm-generic/dma-mapping-broken.h
@@ -0,0 +1,22 @@
+#ifndef _ASM_GENERIC_DMA_MAPPING_H
+#define _ASM_GENERIC_DMA_MAPPING_H
@@ -475,8 +475,8 @@
+}
+
+#endif /* _ASM_GENERIC_DMA_MAPPING_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/dma-mapping.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/dma-mapping.h 2005-05-18 20:35:06.000000000 +0200
+--- linux/include/asm-generic/dma-mapping.h
++++ linux/include/asm-generic/dma-mapping.h
@@ -0,0 +1,309 @@
+/* Copyright (C) 2002 by James.Bottomley@HansenPartnership.com
+ *
@@ -787,8 +787,8 @@
+
+#endif
+
---- linux-libc-headers-2.6.9.1/include/asm-generic/errno-base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/errno-base.h 2004-01-16 16:00:38.000000000 +0100
+--- linux/include/asm-generic/errno-base.h
++++ linux/include/asm-generic/errno-base.h
@@ -0,0 +1,39 @@
+#ifndef _ASM_GENERIC_ERRNO_BASE_H
+#define _ASM_GENERIC_ERRNO_BASE_H
@@ -829,8 +829,8 @@
+#define ERANGE 34 /* Math result not representable */
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-generic/errno.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/errno.h 2004-01-16 16:00:38.000000000 +0100
+--- linux/include/asm-generic/errno.h
++++ linux/include/asm-generic/errno.h
@@ -0,0 +1,100 @@
+#ifndef _ASM_GENERIC_ERRNO_H
+#define _ASM_GENERIC_ERRNO_H
@@ -932,8 +932,8 @@
+#define EMEDIUMTYPE 124 /* Wrong medium type */
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-generic/hdreg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/hdreg.h 2004-11-27 15:04:26.000000000 +0100
+--- linux/include/asm-generic/hdreg.h
++++ linux/include/asm-generic/hdreg.h
@@ -0,0 +1,8 @@
+#warning <asm/hdreg.h> is obsolete, please do not use it
+
@@ -943,8 +943,8 @@
+typedef unsigned long ide_ioreg_t;
+
+#endif /* __ASM_GENERIC_HDREG_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/ide_iops.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/ide_iops.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-generic/ide_iops.h
++++ linux/include/asm-generic/ide_iops.h
@@ -0,0 +1,38 @@
+/* Generic I/O and MEMIO string operations. */
+
@@ -984,8 +984,8 @@
+ addr += 4;
+ }
+}
---- linux-libc-headers-2.6.9.1/include/asm-generic/iomap.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/iomap.h 2004-11-27 15:04:26.000000000 +0100
+--- linux/include/asm-generic/iomap.h
++++ linux/include/asm-generic/iomap.h
@@ -0,0 +1,63 @@
+#ifndef __GENERIC_IO_H
+#define __GENERIC_IO_H
@@ -1050,8 +1050,8 @@
+extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-generic/local.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/local.h 2005-05-18 20:35:10.000000000 +0200
+--- linux/include/asm-generic/local.h
++++ linux/include/asm-generic/local.h
@@ -0,0 +1,118 @@
+#ifndef _ASM_GENERIC_LOCAL_H
+#define _ASM_GENERIC_LOCAL_H
@@ -1171,8 +1171,8 @@
+#define __cpu_local_sub(i, v) __local_sub((i), &__get_cpu_var(v))
+
+#endif /* _ASM_GENERIC_LOCAL_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/pci-dma-compat.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/pci-dma-compat.h 2004-05-07 15:36:24.000000000 +0200
+--- linux/include/asm-generic/pci-dma-compat.h
++++ linux/include/asm-generic/pci-dma-compat.h
@@ -0,0 +1,107 @@
+/* include this file if the platform implements the dma_ DMA Mapping API
+ * and wants to provide the pci_ DMA Mapping API in terms of it */
@@ -1281,8 +1281,8 @@
+}
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-generic/pci.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/pci.h 2004-05-07 15:36:24.000000000 +0200
+--- linux/include/asm-generic/pci.h
++++ linux/include/asm-generic/pci.h
@@ -0,0 +1,27 @@
+/*
+ * linux/include/asm-generic/pci.h
@@ -1311,8 +1311,8 @@
+#define pcibios_scan_all_fns(a, b) 0
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-generic/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/percpu.h 2004-02-08 17:04:22.000000000 +0100
+--- linux/include/asm-generic/percpu.h
++++ linux/include/asm-generic/percpu.h
@@ -0,0 +1,42 @@
+#ifndef _ASM_GENERIC_PERCPU_H_
+#define _ASM_GENERIC_PERCPU_H_
@@ -1356,8 +1356,8 @@
+#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var)
+
+#endif /* _ASM_GENERIC_PERCPU_H_ */
---- linux-libc-headers-2.6.9.1/include/asm-generic/pgtable.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/pgtable.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-generic/pgtable.h
++++ linux/include/asm-generic/pgtable.h
@@ -0,0 +1,137 @@
+#ifndef _ASM_GENERIC_PGTABLE_H
+#define _ASM_GENERIC_PGTABLE_H
@@ -1496,8 +1496,8 @@
+#endif
+
+#endif /* _ASM_GENERIC_PGTABLE_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/rmap.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/rmap.h 2004-01-16 16:00:38.000000000 +0100
+--- linux/include/asm-generic/rmap.h
++++ linux/include/asm-generic/rmap.h
@@ -0,0 +1,90 @@
+#ifndef _GENERIC_RMAP_H
+#define _GENERIC_RMAP_H
@@ -1589,8 +1589,8 @@
+#endif
+
+#endif /* _GENERIC_RMAP_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/rtc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/rtc.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-generic/rtc.h
++++ linux/include/asm-generic/rtc.h
@@ -0,0 +1,213 @@
+/*
+ * inclue/asm-generic/rtc.h
@@ -1805,8 +1805,8 @@
+
+#endif /* __KERNEL__ */
+#endif /* __ASM_RTC_H__ */
---- linux-libc-headers-2.6.9.1/include/asm-generic/sections.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/sections.h 2004-01-25 14:35:16.000000000 +0100
+--- linux/include/asm-generic/sections.h
++++ linux/include/asm-generic/sections.h
@@ -0,0 +1,12 @@
+#ifndef _ASM_GENERIC_SECTIONS_H_
+#define _ASM_GENERIC_SECTIONS_H_
@@ -1820,8 +1820,8 @@
+extern char _sinittext[], _einittext[];
+
+#endif /* _ASM_GENERIC_SECTIONS_H_ */
---- linux-libc-headers-2.6.9.1/include/asm-generic/siginfo.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/siginfo.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-generic/siginfo.h
++++ linux/include/asm-generic/siginfo.h
@@ -0,0 +1,295 @@
+#ifndef _ASM_GENERIC_SIGINFO_H
+#define _ASM_GENERIC_SIGINFO_H
@@ -2118,8 +2118,8 @@
+#endif /* __KERNEL__ */
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-generic/statfs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/statfs.h 2004-01-25 14:35:16.000000000 +0100
+--- linux/include/asm-generic/statfs.h
++++ linux/include/asm-generic/statfs.h
@@ -0,0 +1,51 @@
+#ifndef _GENERIC_STATFS_H
+#define _GENERIC_STATFS_H
@@ -2172,8 +2172,8 @@
+};
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-generic/tlb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/tlb.h 2005-05-18 20:35:14.000000000 +0200
+--- linux/include/asm-generic/tlb.h
++++ linux/include/asm-generic/tlb.h
@@ -0,0 +1,152 @@
+/* asm-generic/tlb.h
+ *
@@ -2327,8 +2327,8 @@
+#define tlb_migrate_finish(mm) do {} while (0)
+
+#endif /* _ASM_GENERIC__TLB_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/topology.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/topology.h 2004-05-07 15:36:24.000000000 +0200
+--- linux/include/asm-generic/topology.h
++++ linux/include/asm-generic/topology.h
@@ -0,0 +1,53 @@
+/*
+ * linux/include/asm-generic/topology.h
@@ -2383,8 +2383,8 @@
+#endif
+
+#endif /* _ASM_GENERIC_TOPOLOGY_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/uaccess.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/uaccess.h 2004-11-27 15:04:26.000000000 +0100
+--- linux/include/asm-generic/uaccess.h
++++ linux/include/asm-generic/uaccess.h
@@ -0,0 +1,26 @@
+#ifndef _ASM_GENERIC_UACCESS_H_
+#define _ASM_GENERIC_UACCESS_H_
@@ -2412,8 +2412,8 @@
+})
+
+#endif /* _ASM_GENERIC_UACCESS_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/unaligned.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/unaligned.h 2004-01-16 16:00:38.000000000 +0100
+--- linux/include/asm-generic/unaligned.h
++++ linux/include/asm-generic/unaligned.h
@@ -0,0 +1,20 @@
+#ifndef _ASM_GENERIC_UNALIGNED_H_
+#define _ASM_GENERIC_UNALIGNED_H_
@@ -2435,8 +2435,8 @@
+ (void)0; })
+
+#endif /* _ASM_GENERIC_UNALIGNED_H */
---- linux-libc-headers-2.6.9.1/include/asm-generic/vmlinux.lds.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/vmlinux.lds.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-generic/vmlinux.lds.h
++++ linux/include/asm-generic/vmlinux.lds.h
@@ -0,0 +1,84 @@
+#ifndef LOAD_OFFSET
+#define LOAD_OFFSET 0
@@ -2522,8 +2522,8 @@
+ VMLINUX_SYMBOL(__lock_text_start) = .; \
+ *(.spinlock.text) \
+ VMLINUX_SYMBOL(__lock_text_end) = .;
---- linux-libc-headers-2.6.9.1/include/asm-generic/xor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-generic/xor.h 2004-01-16 16:00:38.000000000 +0100
+--- linux/include/asm-generic/xor.h
++++ linux/include/asm-generic/xor.h
@@ -0,0 +1,718 @@
+/*
+ * include/asm-generic/xor.h
@@ -3243,8 +3243,8 @@
+ xor_speed(&xor_block_32regs); \
+ xor_speed(&xor_block_32regs_p); \
+ } while (0)
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/ChangeLog 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/ChangeLog 2004-06-29 11:18:14.000000000 +0200
+--- linux/include/asm-nios2nommu/ChangeLog
++++ linux/include/asm-nios2nommu/ChangeLog
@@ -0,0 +1,14 @@
+2004-06-29 Ken Hill <khill@microtronix.com>
+
@@ -3260,8 +3260,8 @@
+ * page.h (PAGE_OFFSET): Change na_sdram to nasys_program_mem to remove
+ dependancy on quartus memory component name.
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/a.out.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/a.out.h 2004-03-30 14:35:04.000000000 +0200
+--- linux/include/asm-nios2nommu/a.out.h
++++ linux/include/asm-nios2nommu/a.out.h
@@ -0,0 +1,85 @@
+/* $Id: a.out.h,v 1.4 2004/03/30 19:35:04 ken-h Exp $ */
+/*
@@ -3348,8 +3348,8 @@
+#endif
+
+#endif /* __NIOS2NOMMU_A_OUT_H__ */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/asm-macros.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/asm-macros.h 2004-05-14 13:32:04.000000000 +0200
+--- linux/include/asm-nios2nommu/asm-macros.h
++++ linux/include/asm-nios2nommu/asm-macros.h
@@ -0,0 +1,331 @@
+/*
+ * Macro used to simplify coding multi-line assembler.
@@ -3682,8 +3682,8 @@
+__ALIGN
+ \name:
+.endm
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/atomic.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/atomic.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/atomic.h
++++ linux/include/asm-nios2nommu/atomic.h
@@ -0,0 +1,190 @@
+//vic - add 'atomic_add/sub_return', 'atomic_add_negative'
+//vic from v850 architecture
@@ -3875,8 +3875,8 @@
+#endif /* !(__ARCH_NIOS2NOMMU_ATOMIC__) */
+
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/bitops.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/bitops.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/bitops.h
++++ linux/include/asm-nios2nommu/bitops.h
@@ -0,0 +1,472 @@
+#ifndef _ASM_NIOS_BITOPS_H_
+#define _ASM_NIOS_BITOPS_H_
@@ -4350,13 +4350,13 @@
+#define ext2_find_next_zero_bit find_next_zero_bit
+
+#endif /* _ASM_NIOS_BITOPS_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/bootinfo.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/bootinfo.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/bootinfo.h
++++ linux/include/asm-nios2nommu/bootinfo.h
@@ -0,0 +1,2 @@
+
+/* Nothing for nios2nommu */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/bug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/bug.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/bug.h
++++ linux/include/asm-nios2nommu/bug.h
@@ -0,0 +1,48 @@
+#ifndef _NIOS2NOMMU_BUG_H
+#define _NIOS2NOMMU_BUG_H
@@ -4406,8 +4406,8 @@
+} while (0)
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/bugs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/bugs.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/bugs.h
++++ linux/include/asm-nios2nommu/bugs.h
@@ -0,0 +1,40 @@
+#ifndef __ASM_NIOS_BUGS_H
+#define __ASM_NIOS_BUGS_H
@@ -4449,8 +4449,8 @@
+}
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/byteorder.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/byteorder.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/byteorder.h
++++ linux/include/asm-nios2nommu/byteorder.h
@@ -0,0 +1,38 @@
+#ifndef __ASM_NIOS_BYTEORDER_H
+#define __ASM_NIOS_BYTEORDER_H
@@ -4490,8 +4490,8 @@
+
+#endif
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/cache.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/cache.h 2004-02-26 13:25:08.000000000 +0100
+--- linux/include/asm-nios2nommu/cache.h
++++ linux/include/asm-nios2nommu/cache.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2004 Microtronix Datacom Ltd.
@@ -4527,8 +4527,8 @@
+#define ____cacheline_aligned
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/cachectl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/cachectl.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/cachectl.h
++++ linux/include/asm-nios2nommu/cachectl.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2004 Microtronix Datacom Ltd.
@@ -4566,8 +4566,8 @@
+#define FLUSH_CACHE_BOTH 3 /* Flush both caches */
+
+#endif /* _NIOS2NOMMU_CACHECTL_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/cacheflush.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/cacheflush.h 2004-05-14 13:32:04.000000000 +0200
+--- linux/include/asm-nios2nommu/cacheflush.h
++++ linux/include/asm-nios2nommu/cacheflush.h
@@ -0,0 +1,56 @@
+#ifndef _NIOS2NOMMU_CACHEFLUSH_H
+#define _NIOS2NOMMU_CACHEFLUSH_H
@@ -4625,8 +4625,8 @@
+}
+
+#endif /* _NIOS2NOMMU_CACHEFLUSH_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/checksum.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/checksum.h 2005-01-10 13:35:22.000000000 +0100
+--- linux/include/asm-nios2nommu/checksum.h
++++ linux/include/asm-nios2nommu/checksum.h
@@ -0,0 +1,320 @@
+#ifndef __NIOS2_CHECKSUM_H
+#define __NIOS2_CHECKSUM_H
@@ -4948,8 +4948,8 @@
+
+
+#endif /* (__NIOS2_CHECKSUM_H) */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/cprefix.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/cprefix.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/cprefix.h
++++ linux/include/asm-nios2nommu/cprefix.h
@@ -0,0 +1,38 @@
+/* cprefix.h: This file is included by assembly source which needs
+ * to know what the c-label prefixes are. The newer versions
@@ -4989,8 +4989,8 @@
+#define C_LABEL(name) CONCAT(C_LABEL_PREFIX, name)
+
+#endif /* !(__NIOS2_CPREFIX_H) */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/cpumask.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/cpumask.h 2004-01-25 14:35:16.000000000 +0100
+--- linux/include/asm-nios2nommu/cpumask.h
++++ linux/include/asm-nios2nommu/cpumask.h
@@ -0,0 +1,28 @@
+/*
+ * All rights reserved.
@@ -5020,8 +5020,8 @@
+#include <asm-generic/cpumask.h>
+
+#endif /* _ASM_NIOS2NOMMU_CPUMASK_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/current.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/current.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/current.h
++++ linux/include/asm-nios2nommu/current.h
@@ -0,0 +1,39 @@
+#ifndef _NIOS2NOMMU_CURRENT_H
+#define _NIOS2NOMMU_CURRENT_H
@@ -5062,8 +5062,8 @@
+#define current get_current()
+
+#endif /* _NIOS2NOMMU_CURRENT_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/delay.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/delay.h 2004-05-14 13:32:04.000000000 +0200
+--- linux/include/asm-nios2nommu/delay.h
++++ linux/include/asm-nios2nommu/delay.h
@@ -0,0 +1,96 @@
+#ifndef _NIOS_DELAY_H
+#define _NIOS_DELAY_H
@@ -5161,8 +5161,8 @@
+#define muldiv(a, b, c) (((a)*(b))/(c))
+
+#endif /* defined(_NIOS_DELAY_H) */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/div64.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/div64.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/div64.h
++++ linux/include/asm-nios2nommu/div64.h
@@ -0,0 +1,31 @@
+#ifndef __ASMNIOS_DIV64_H
+#define __ASMNIOS_DIV64_H
@@ -5195,8 +5195,8 @@
+
+#endif
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/dma-mapping.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/dma-mapping.h 2004-05-07 15:36:26.000000000 +0200
+--- linux/include/asm-nios2nommu/dma-mapping.h
++++ linux/include/asm-nios2nommu/dma-mapping.h
@@ -0,0 +1,25 @@
+/*
+ * include/asm-s390/dma-mapping.h
@@ -5223,8 +5223,8 @@
+}
+
+#endif /* _ASM_DMA_MAPPING_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/dma.h 2004-03-02 11:05:52.000000000 +0100
+--- linux/include/asm-nios2nommu/dma.h
++++ linux/include/asm-nios2nommu/dma.h
@@ -0,0 +1,40 @@
+/* $Id: dma.h,v 1.5 2004/03/02 16:05:52 ken-h Exp $
+ *
@@ -5266,8 +5266,8 @@
+extern void free_dma(unsigned int);
+
+#endif /* !(_ASM_NIOS2_DMA_H) */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/elf.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/elf.h 2005-05-18 20:35:42.000000000 +0200
+--- linux/include/asm-nios2nommu/elf.h
++++ linux/include/asm-nios2nommu/elf.h
@@ -0,0 +1,141 @@
+#ifndef __NIOS2_ELF_H
+#define __NIOS2_ELF_H
@@ -5410,8 +5410,8 @@
+#endif
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/entry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/entry.h 2005-05-18 20:35:50.000000000 +0200
+--- linux/include/asm-nios2nommu/entry.h
++++ linux/include/asm-nios2nommu/entry.h
@@ -0,0 +1,188 @@
+/*
+ * Hacked from m68knommu port.
@@ -5601,8 +5601,8 @@
+
+#endif /* __ASSEMBLY__ */
+#endif /* __NIOS2NOMMU_ENTRY_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/errno.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/errno.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/errno.h
++++ linux/include/asm-nios2nommu/errno.h
@@ -0,0 +1,6 @@
+#ifndef _NIOS2NOMMU_ERRNO_H
+#define _NIOS2NOMMU_ERRNO_H
@@ -5610,8 +5610,8 @@
+#include <asm-generic/errno.h>
+
+#endif /* _NIOS2NOMMU_ERRNO_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/fcntl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/fcntl.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/fcntl.h
++++ linux/include/asm-nios2nommu/fcntl.h
@@ -0,0 +1,110 @@
+/*
+ * This file came from the m68k port.
@@ -5723,8 +5723,8 @@
+
+#define F_LINUX_SPECIFIC_BASE 1024
+#endif /* _NIOS2_FCNTL_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/flat.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/flat.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/flat.h
++++ linux/include/asm-nios2nommu/flat.h
@@ -0,0 +1,126 @@
+/*
+ * include/asm-nios2nommu/flat.h -- uClinux bFLT relocations
@@ -5852,8 +5852,8 @@
+}
+
+#endif /* __NIOS2_FLAT_H__ */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/hardirq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/hardirq.h 2005-05-18 20:35:54.000000000 +0200
+--- linux/include/asm-nios2nommu/hardirq.h
++++ linux/include/asm-nios2nommu/hardirq.h
@@ -0,0 +1,85 @@
+/*
+ * Ported from m68knommu
@@ -5940,8 +5940,8 @@
+#endif /* CONFIG_SMP */
+
+#endif /* __NIOS2_HARDIRQ_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/hdreg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/hdreg.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/hdreg.h
++++ linux/include/asm-nios2nommu/hdreg.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 1994-1996 Linus Torvalds & authors
@@ -5973,8 +5973,8 @@
+typedef unsigned long ide_ioreg_t;
+
+#endif /* __NIOS2_HDREG_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/hw_irq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/hw_irq.h 2004-09-01 12:54:44.000000000 +0200
+--- linux/include/asm-nios2nommu/hw_irq.h
++++ linux/include/asm-nios2nommu/hw_irq.h
@@ -0,0 +1,16 @@
+#ifndef _ASM_HW_IRQ_H
+#define _ASM_HW_IRQ_H
@@ -5992,8 +5992,8 @@
+
+
+#endif /* _ASM_HW_IRQ_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/ide.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/ide.h 2004-12-15 12:01:40.000000000 +0100
+--- linux/include/asm-nios2nommu/ide.h
++++ linux/include/asm-nios2nommu/ide.h
@@ -0,0 +1,47 @@
+/*
+ * linux/include/asm-niosnommu2/ide.h
@@ -6042,8 +6042,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* __ASMNIOS2_IDE_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/init.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/init.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/init.h
++++ linux/include/asm-nios2nommu/init.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -6067,8 +6067,8 @@
+ *
+ */
+#error "<asm/init.h> should never be used - use <linux/init.h> instead"
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/io.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/io.h 2004-12-23 15:46:46.000000000 +0100
+--- linux/include/asm-nios2nommu/io.h
++++ linux/include/asm-nios2nommu/io.h
@@ -0,0 +1,239 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -6309,8 +6309,8 @@
+
+#endif /* !(__NIOS2_IO_H) */
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/ioctl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/ioctl.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/ioctl.h
++++ linux/include/asm-nios2nommu/ioctl.h
@@ -0,0 +1,100 @@
+/* $Id: ioctl.h,v 1.3 2004/02/12 23:06:40 ken-h Exp $
+ *
@@ -6412,8 +6412,8 @@
+#define IOCSIZE_SHIFT (_IOC_SIZESHIFT)
+
+#endif /* _NIOS2_IOCTL_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/ioctls.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/ioctls.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/ioctls.h
++++ linux/include/asm-nios2nommu/ioctls.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -6518,8 +6518,8 @@
+#define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
+
+#endif /* __ARCH_NIOS2_IOCTLS_H__ */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/ipc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/ipc.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/ipc.h
++++ linux/include/asm-nios2nommu/ipc.h
@@ -0,0 +1,51 @@
+#ifndef __NIOS2_IPC_H__
+#define __NIOS2_IPC_H__
@@ -6572,8 +6572,8 @@
+#define IPCCALL(version,op) ((version)<<16 | (op))
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/ipcbuf.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/ipcbuf.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/ipcbuf.h
++++ linux/include/asm-nios2nommu/ipcbuf.h
@@ -0,0 +1,49 @@
+#ifndef __NIOS2_IPCBUF_H__
+#define __NIOS2_IPCBUF_H__
@@ -6624,8 +6624,8 @@
+};
+
+#endif /* __NIOS2_IPCBUF_H__ */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/irq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/irq.h 2005-05-18 20:36:00.000000000 +0200
+--- linux/include/asm-nios2nommu/irq.h
++++ linux/include/asm-nios2nommu/irq.h
@@ -0,0 +1,182 @@
+/*
+ * 21Mar2001 1.1 dgt/microtronix
@@ -6809,8 +6809,8 @@
+#endif
+
+#endif /* _NIOS2NOMMU_IRQ_H_ */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/kmap_types.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/kmap_types.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/kmap_types.h
++++ linux/include/asm-nios2nommu/kmap_types.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -6855,8 +6855,8 @@
+};
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/linkage.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/linkage.h 2004-03-12 11:50:10.000000000 +0100
+--- linux/include/asm-nios2nommu/linkage.h
++++ linux/include/asm-nios2nommu/linkage.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -6887,8 +6887,8 @@
+#define __ALIGN_STR ".align 3"
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/linux_logo.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/linux_logo.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/linux_logo.h
++++ linux/include/asm-nios2nommu/linux_logo.h
@@ -0,0 +1,953 @@
+/* $Id: linux_logo.h,v 1.3 2004/02/12 23:06:40 ken-h Exp $
+ * include/asm-nios/linux_logo.h: This is a linux logo
@@ -7843,8 +7843,8 @@
+
+#include <linux/linux_logo.h>
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/local.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/local.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/local.h
++++ linux/include/asm-nios2nommu/local.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -7874,8 +7874,8 @@
+#include <asm-generic/local.h>
+
+#endif /* __NIOS2NOMMU_LOCAL_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/mc146818rtc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/mc146818rtc.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/mc146818rtc.h
++++ linux/include/asm-nios2nommu/mc146818rtc.h
@@ -0,0 +1,29 @@
+/*
+ * Machine dependent access functions for RTC registers.
@@ -7906,8 +7906,8 @@
+/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
+
+#endif /* _NIOS2_MC146818RTC_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/mman.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/mman.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/mman.h
++++ linux/include/asm-nios2nommu/mman.h
@@ -0,0 +1,68 @@
+/*
+ * Copied from the m68k port.
@@ -7977,8 +7977,8 @@
+
+#endif /* __NIOS2_MMAN_H__ */
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/mmu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/mmu.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/mmu.h
++++ linux/include/asm-nios2nommu/mmu.h
@@ -0,0 +1,47 @@
+/*
+ *
@@ -8027,8 +8027,8 @@
+} mm_context_t;
+
+#endif /* __NIOS2NOMMU_MMU_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/mmu_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/mmu_context.h 2005-05-18 20:36:04.000000000 +0200
+--- linux/include/asm-nios2nommu/mmu_context.h
++++ linux/include/asm-nios2nommu/mmu_context.h
@@ -0,0 +1,58 @@
+/*
+ *
@@ -8088,8 +8088,8 @@
+}
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/module.h 2004-03-19 13:57:58.000000000 +0100
+--- linux/include/asm-nios2nommu/module.h
++++ linux/include/asm-nios2nommu/module.h
@@ -0,0 +1,36 @@
+#ifndef _NIOS2_MODULE_H
+#define _NIOS2_MODULE_H
@@ -8127,8 +8127,8 @@
+#define Elf_Ehdr Elf32_Ehdr
+
+#endif /* _NIOS_MODULE_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/msgbuf.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/msgbuf.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/msgbuf.h
++++ linux/include/asm-nios2nommu/msgbuf.h
@@ -0,0 +1,56 @@
+/*
+ * Taken from the m68k.
@@ -8186,8 +8186,8 @@
+
+#endif /* _NIOS2_MSGBUF_H */
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/namei.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/namei.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/namei.h
++++ linux/include/asm-nios2nommu/namei.h
@@ -0,0 +1,36 @@
+/*
+ * linux/include/asm-nios/namei.h
@@ -8225,8 +8225,8 @@
+#define __emul_prefix() NULL
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/ndma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/ndma.h 2004-05-07 15:45:52.000000000 +0200
+--- linux/include/asm-nios2nommu/ndma.h
++++ linux/include/asm-nios2nommu/ndma.h
@@ -0,0 +1,64 @@
+#ifndef __NDMA_H__
+ #define __NDMA_H__
@@ -8292,8 +8292,8 @@
+
+#endif
+/* End of File */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/nios.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/nios.h 2004-04-01 15:12:56.000000000 +0200
+--- linux/include/asm-nios2nommu/nios.h
++++ linux/include/asm-nios2nommu/nios.h
@@ -0,0 +1,7 @@
+#ifndef __NIOS_H__
+#define __NIOS_H__
@@ -8302,8 +8302,8 @@
+
+#endif
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/page.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/page.h 2005-05-18 20:36:38.000000000 +0200
+--- linux/include/asm-nios2nommu/page.h
++++ linux/include/asm-nios2nommu/page.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -8440,8 +8440,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* _NIOS2_PAGE_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/param.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/param.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/param.h
++++ linux/include/asm-nios2nommu/param.h
@@ -0,0 +1,49 @@
+#ifndef _NIOS_PARAM_H
+#define _NIOS_PARAM_H
@@ -8492,8 +8492,8 @@
+#define MAXHOSTNAMELEN 64 /* max length of hostname */
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/pci.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/pci.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/pci.h
++++ linux/include/asm-nios2nommu/pci.h
@@ -0,0 +1,75 @@
+#ifndef _ASM_NIOS2NOMMU_PCI_H
+#define _ASM_NIOS2NOMMU_PCI_H
@@ -8570,8 +8570,8 @@
+#define PCI_DMA_BUS_IS_PHYS (1)
+
+#endif /* _ASM_NIOS2NOMMU_PCI_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/percpu.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/percpu.h
++++ linux/include/asm-nios2nommu/percpu.h
@@ -0,0 +1,30 @@
+#ifndef __ARCH_NIOS2NOMMU_PERCPU__
+#define __ARCH_NIOS2NOMMU_PERCPU__
@@ -8603,8 +8603,8 @@
+#include <asm-generic/percpu.h>
+
+#endif /* __ARCH_NIOS2NOMMU_PERCPU__ */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/pgalloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/pgalloc.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/pgalloc.h
++++ linux/include/asm-nios2nommu/pgalloc.h
@@ -0,0 +1,32 @@
+#ifndef _NIOS2NOMMU_PGALLOC_H
+#define _NIOS2NOMMU_PGALLOC_H
@@ -8638,8 +8638,8 @@
+#define check_pgt_cache() do { } while (0)
+
+#endif /* _NIOS2NOMMU_PGALLOC_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/pgtable.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/pgtable.h 2005-05-18 20:36:09.000000000 +0200
+--- linux/include/asm-nios2nommu/pgtable.h
++++ linux/include/asm-nios2nommu/pgtable.h
@@ -0,0 +1,100 @@
+#ifndef _NIOS_PGTABLE_H
+#define _NIOS_PGTABLE_H
@@ -8741,8 +8741,8 @@
+#define VMALLOC_END 0xffffffff
+
+#endif /* _NIOS_PGTABLE_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/pio_struct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/pio_struct.h 2004-12-22 15:23:36.000000000 +0100
+--- linux/include/asm-nios2nommu/pio_struct.h
++++ linux/include/asm-nios2nommu/pio_struct.h
@@ -0,0 +1,14 @@
+// PIO Peripheral
+
@@ -8758,8 +8758,8 @@
+// PIO Routines
+void nr_pio_showhex(int value); // shows low byte on pio named na_seven_seg_pio
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/poll.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/poll.h 2004-03-04 15:03:18.000000000 +0100
+--- linux/include/asm-nios2nommu/poll.h
++++ linux/include/asm-nios2nommu/poll.h
@@ -0,0 +1,46 @@
+#ifndef __NIOS2_POLL_H
+#define __NIOS2_POLL_H
@@ -8807,8 +8807,8 @@
+};
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/posix_types.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/posix_types.h 2004-03-04 11:54:08.000000000 +0100
+--- linux/include/asm-nios2nommu/posix_types.h
++++ linux/include/asm-nios2nommu/posix_types.h
@@ -0,0 +1,89 @@
+#ifndef __ARCH_NIOS2_POSIX_TYPES_H
+#define __ARCH_NIOS2_POSIX_TYPES_H
@@ -8899,8 +8899,8 @@
+#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/preem_latency.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/preem_latency.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/preem_latency.h
++++ linux/include/asm-nios2nommu/preem_latency.h
@@ -0,0 +1,39 @@
+#ifndef _ASM_PREEM_LATENCY_H
+#define _ASM_PREEM_LATENCY_H
@@ -8941,8 +8941,8 @@
+#define readclock_init()
+
+#endif /* _ASM_PREEM_LATENCY_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/processor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/processor.h 2004-06-04 15:44:18.000000000 +0200
+--- linux/include/asm-nios2nommu/processor.h
++++ linux/include/asm-nios2nommu/processor.h
@@ -0,0 +1,148 @@
+/*--------------------------------------------------------------------
+ *
@@ -9092,8 +9092,8 @@
+#define cpu_relax() do { } while (0)
+#endif /* __ASSEMBLY__ */
+#endif /* __ASM_NIOS_PROCESSOR_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/ptrace.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/ptrace.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/ptrace.h
++++ linux/include/asm-nios2nommu/ptrace.h
@@ -0,0 +1,141 @@
+/*
+ * Taken from the m68k port.
@@ -9236,8 +9236,8 @@
+#endif /* __KERNEL__ */
+#endif /* __ASSEMBLY__ */
+#endif /* _NIOS2NOMMU_PTRACE_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/resource.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/resource.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/resource.h
++++ linux/include/asm-nios2nommu/resource.h
@@ -0,0 +1,73 @@
+#ifndef _NIOS2NOMMU_RESOURCE_H
+#define _NIOS2NOMMU_RESOURCE_H
@@ -9312,13 +9312,13 @@
+#endif /* __KERNEL__ */
+
+#endif /* _NIOS2NOMMU_RESOURCE_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/rmap.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/rmap.h 2004-01-16 16:00:44.000000000 +0100
+--- linux/include/asm-nios2nommu/rmap.h
++++ linux/include/asm-nios2nommu/rmap.h
@@ -0,0 +1,2 @@
+/* Do not need anything here */
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/scatterlist.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/scatterlist.h 2004-12-15 12:02:14.000000000 +0100
+--- linux/include/asm-nios2nommu/scatterlist.h
++++ linux/include/asm-nios2nommu/scatterlist.h
@@ -0,0 +1,40 @@
+#ifndef _NIOS2NOMMU_SCATTERLIST_H
+#define _NIOS2NOMMU_SCATTERLIST_H
@@ -9360,8 +9360,8 @@
+#define ISA_DMA_THRESHOLD (0xffffffff)
+
+#endif /* !(_NIOS2NOMMU_SCATTERLIST_H) */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/sections.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/sections.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/sections.h
++++ linux/include/asm-nios2nommu/sections.h
@@ -0,0 +1,30 @@
+#ifndef _NIOS2NOMMU_SECTIONS_H
+#define _NIOS2NOMMU_SECTIONS_H
@@ -9393,8 +9393,8 @@
+#include <asm-generic/sections.h>
+
+#endif /* _NIOS2NOMMU_SECTIONS_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/segment.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/segment.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/segment.h
++++ linux/include/asm-nios2nommu/segment.h
@@ -0,0 +1,75 @@
+#ifndef _NIOS2NOMMU_SEGMENT_H
+#define _NIOS2NOMMU_SEGMENT_H
@@ -9471,8 +9471,8 @@
+#endif /* __ASSEMBLY__ */
+
+#endif /* _NIOS2NOMMU_SEGMENT_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/semaphore-helper.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/semaphore-helper.h 2005-05-18 20:36:13.000000000 +0200
+--- linux/include/asm-nios2nommu/semaphore-helper.h
++++ linux/include/asm-nios2nommu/semaphore-helper.h
@@ -0,0 +1,101 @@
+#ifndef _NIOS2NOMMU_SEMAPHORE_HELPER_H
+#define _NIOS2NOMMU_SEMAPHORE_HELPER_H
@@ -9575,8 +9575,8 @@
+}
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/semaphore.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/semaphore.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/semaphore.h
++++ linux/include/asm-nios2nommu/semaphore.h
@@ -0,0 +1,155 @@
+#ifndef _NIOS2NOMMU_SEMAPHORE_H
+#define _NIOS2NOMMU_SEMAPHORE_H
@@ -9733,8 +9733,8 @@
+#endif /* __ASSEMBLY__ */
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/sembuf.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/sembuf.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/sembuf.h
++++ linux/include/asm-nios2nommu/sembuf.h
@@ -0,0 +1,48 @@
+#ifndef _NIOS_SEMBUF_H
+#define _NIOS_SEMBUF_H
@@ -9784,8 +9784,8 @@
+};
+
+#endif /* _NIOS_SEMBUF_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/setup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/setup.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/setup.h
++++ linux/include/asm-nios2nommu/setup.h
@@ -0,0 +1,31 @@
+/* Copied from i386 port.
+ * Just a place holder. We don't want to have to test x86 before
@@ -9818,8 +9818,8 @@
+#define COMMAND_LINE_SIZE 512
+
+#endif /* _NIOS2_SETUP_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/shmbuf.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/shmbuf.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/shmbuf.h
++++ linux/include/asm-nios2nommu/shmbuf.h
@@ -0,0 +1,64 @@
+#ifndef _NIOS_SHMBUF_H
+#define _NIOS_SHMBUF_H
@@ -9885,8 +9885,8 @@
+};
+
+#endif /* _NIOS_SHMBUF_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/shmparam.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/shmparam.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/shmparam.h
++++ linux/include/asm-nios2nommu/shmparam.h
@@ -0,0 +1,30 @@
+#ifndef __NIOS2NOMMU_SHMPARAM_H__
+#define __NIOS2NOMMU_SHMPARAM_H__
@@ -9918,8 +9918,8 @@
+#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
+
+#endif /* __NIOS2NOMMU_SHMPARAM_H__ */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/sigcontext.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/sigcontext.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/sigcontext.h
++++ linux/include/asm-nios2nommu/sigcontext.h
@@ -0,0 +1,35 @@
+/*
+ * Taken from the m68knommu.
@@ -9956,8 +9956,8 @@
+};
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/siginfo.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/siginfo.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/siginfo.h
++++ linux/include/asm-nios2nommu/siginfo.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -9987,8 +9987,8 @@
+#include <asm-generic/siginfo.h>
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/signal.h 2004-02-12 18:06:40.000000000 +0100
+--- linux/include/asm-nios2nommu/signal.h
++++ linux/include/asm-nios2nommu/signal.h
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -10197,8 +10197,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* _NIOS2_SIGNAL_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/smp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/smp.h 2005-05-18 20:36:18.000000000 +0200
+--- linux/include/asm-nios2nommu/smp.h
++++ linux/include/asm-nios2nommu/smp.h
@@ -0,0 +1,34 @@
+#ifndef __ASM_SMP_H
+#define __ASM_SMP_H
@@ -10234,8 +10234,8 @@
+#endif
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/socket.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/socket.h
++++ linux/include/asm-nios2nommu/socket.h
@@ -0,0 +1,74 @@
+#ifndef _ASM_SOCKET_H
+#define _ASM_SOCKET_H
@@ -10311,8 +10311,8 @@
+#define SO_PEERSEC 31 /* ;dgt2;tmp; */
+
+#endif /* _ASM_SOCKET_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/sockios.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/sockios.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/sockios.h
++++ linux/include/asm-nios2nommu/sockios.h
@@ -0,0 +1,38 @@
+#ifndef _ASM_NIOS_SOCKIOS_H
+#define _ASM_NIOS_SOCKIOS_H
@@ -10352,8 +10352,8 @@
+
+#endif /* !(_ASM_NIOS_SOCKIOS_H) */
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/spi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/spi.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/spi.h
++++ linux/include/asm-nios2nommu/spi.h
@@ -0,0 +1,92 @@
+#ifndef _ASM_SPI_H_
+#define _ASM_SPI_H_ 1
@@ -10447,8 +10447,8 @@
+#define MAX_TEMP_VAR 10
+
+#endif /*_ASM_SPI_H_*/
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/spinlock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/spinlock.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/spinlock.h
++++ linux/include/asm-nios2nommu/spinlock.h
@@ -0,0 +1,30 @@
+#ifndef __NIOS_SPINLOCK_H
+#define __NIOS_SPINLOCK_H
@@ -10480,8 +10480,8 @@
+#error "Nios doesn't do SMP yet"
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/stat.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/stat.h 2004-03-04 12:52:14.000000000 +0100
+--- linux/include/asm-nios2nommu/stat.h
++++ linux/include/asm-nios2nommu/stat.h
@@ -0,0 +1,102 @@
+#ifndef _ASMNIOS2NOMMU_STAT_H
+#define _ASMNIOS2NOMMU_STAT_H
@@ -10585,8 +10585,8 @@
+};
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/statfs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/statfs.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/statfs.h
++++ linux/include/asm-nios2nommu/statfs.h
@@ -0,0 +1,30 @@
+#ifndef _NIOS2NOMMU_STATFS_H
+#define _NIOS2NOMMU_STATFS_H
@@ -10618,8 +10618,8 @@
+#include <asm-generic/statfs.h>
+
+#endif /* _NIOS2NOMMU_STATFS_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/string.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/string.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/string.h
++++ linux/include/asm-nios2nommu/string.h
@@ -0,0 +1,45 @@
+#ifndef __NIOS_STRING_H__
+#define __NIOS_STRING_H__
@@ -10666,8 +10666,8 @@
+#endif /* KERNEL */
+
+#endif /* !(__NIOS_STRING_H__) */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/system.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/system.h 2005-05-18 20:36:23.000000000 +0200
+--- linux/include/asm-nios2nommu/system.h
++++ linux/include/asm-nios2nommu/system.h
@@ -0,0 +1,172 @@
+/*
+ * Taken from the m68k.
@@ -10841,8 +10841,8 @@
+}
+
+#endif /* _NIOS2NOMMU_SYSTEM_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/termbits.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/termbits.h 2004-05-07 15:36:26.000000000 +0200
+--- linux/include/asm-nios2nommu/termbits.h
++++ linux/include/asm-nios2nommu/termbits.h
@@ -0,0 +1,199 @@
+#ifndef __ARCH_NIOS_TERMBITS_H__
+#define __ARCH_NIOS_TERMBITS_H__
@@ -11043,8 +11043,8 @@
+#define TCSAFLUSH 2
+
+#endif /* __ARCH_NIOS_TERMBITS_H__ */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/termios.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/termios.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/termios.h
++++ linux/include/asm-nios2nommu/termios.h
@@ -0,0 +1,132 @@
+#ifndef _NIOS_TERMIOS_H
+#define _NIOS_TERMIOS_H
@@ -11178,8 +11178,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* _NIOS_TERMIOS_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/thread_info.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/thread_info.h 2004-05-14 13:32:04.000000000 +0200
+--- linux/include/asm-nios2nommu/thread_info.h
++++ linux/include/asm-nios2nommu/thread_info.h
@@ -0,0 +1,126 @@
+/* thread_info.h: niosnommu low-level thread information
+ * adapted from the m68knommu
@@ -11307,8 +11307,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_THREAD_INFO_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/timer_struct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/timer_struct.h 2004-12-22 15:23:52.000000000 +0100
+--- linux/include/asm-nios2nommu/timer_struct.h
++++ linux/include/asm-nios2nommu/timer_struct.h
@@ -0,0 +1,38 @@
+
+// ----------------------------------------------
@@ -11348,8 +11348,8 @@
+// Timer Routines
+int nr_timer_milliseconds(void); // Starts on first call, hogs timer1.
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/timex.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/timex.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/timex.h
++++ linux/include/asm-nios2nommu/timex.h
@@ -0,0 +1,48 @@
+#ifndef _ASMNIOS2NOMMU_TIMEX_H
+#define _ASMNIOS2NOMMU_TIMEX_H
@@ -11399,8 +11399,8 @@
+}
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/tlb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/tlb.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/tlb.h
++++ linux/include/asm-nios2nommu/tlb.h
@@ -0,0 +1,35 @@
+#ifndef __NIOS_TLB_H__
+#define __NIOS_TLB_H__
@@ -11437,8 +11437,8 @@
+
+#endif /* __NIOS_TLB_H__ */
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/tlbflush.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/tlbflush.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/tlbflush.h
++++ linux/include/asm-nios2nommu/tlbflush.h
@@ -0,0 +1,86 @@
+#ifndef _NIOS2NOMMU_TLBFLUSH_H
+#define _NIOS2NOMMU_TLBFLUSH_H
@@ -11526,8 +11526,8 @@
+}
+
+#endif /* _NIOS2NOMMU_TLBFLUSH_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/topology.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/topology.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/topology.h
++++ linux/include/asm-nios2nommu/topology.h
@@ -0,0 +1,30 @@
+#ifndef _ASM_NIOS2NOMMU_TOPOLOGY_H
+#define _ASM_NIOS2NOMMU_TOPOLOGY_H
@@ -11559,8 +11559,8 @@
+#include <asm-generic/topology.h>
+
+#endif /* _ASM_NIOS2NOMMU_TOPOLOGY_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/traps.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/traps.h 2004-05-26 10:12:18.000000000 +0200
+--- linux/include/asm-nios2nommu/traps.h
++++ linux/include/asm-nios2nommu/traps.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2004, Microtronix Datacom Ltd.
@@ -11589,8 +11589,8 @@
+#define TRAP_ID_SYSCALL 0
+#define TRAP_ID_APPDEBUG 1
+#endif /* !(_NIOS2_TRAPS_H) */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/types.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/types.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/types.h
++++ linux/include/asm-nios2nommu/types.h
@@ -0,0 +1,93 @@
+#ifndef _NIOS_TYPES_H
+#define _NIOS_TYPES_H
@@ -11685,8 +11685,8 @@
+#endif /* __KERNEL__ */
+
+#endif /* _NIOS_TYPES_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/uaccess.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/uaccess.h 2004-12-08 17:39:48.000000000 +0100
+--- linux/include/asm-nios2nommu/uaccess.h
++++ linux/include/asm-nios2nommu/uaccess.h
@@ -0,0 +1,183 @@
+#ifndef __NIOS2NOMMU_UACCESS_H
+#define __NIOS2NOMMU_UACCESS_H
@@ -11871,8 +11871,8 @@
+}
+
+#endif /* _NIOS2NOMMU_UACCESS_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/uart_struct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/uart_struct.h 2004-12-22 15:23:52.000000000 +0100
+--- linux/include/asm-nios2nommu/uart_struct.h
++++ linux/include/asm-nios2nommu/uart_struct.h
@@ -0,0 +1,83 @@
+
+// UART Registers
@@ -11957,8 +11957,8 @@
+void nr_uart_txhex32(long x);
+void nr_uart_txstring(char *s);
+
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/ucontext.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/ucontext.h 2004-11-16 12:20:14.000000000 +0100
+--- linux/include/asm-nios2nommu/ucontext.h
++++ linux/include/asm-nios2nommu/ucontext.h
@@ -0,0 +1,63 @@
+#ifndef _NIOSKNOMMU_UCONTEXT_H
+#define _NIOSKNOMMU_UCONTEXT_H
@@ -12023,8 +12023,8 @@
+};
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/unaligned.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/unaligned.h 2004-02-26 15:43:36.000000000 +0100
+--- linux/include/asm-nios2nommu/unaligned.h
++++ linux/include/asm-nios2nommu/unaligned.h
@@ -0,0 +1,43 @@
+#ifndef __NIOS_UNALIGNED_H
+#define __NIOS_UNALIGNED_H
@@ -12069,8 +12069,8 @@
+})
+
+#endif /* __NIOS_UNALIGNED_H */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/unistd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/unistd.h 2004-12-23 15:46:22.000000000 +0100
+--- linux/include/asm-nios2nommu/unistd.h
++++ linux/include/asm-nios2nommu/unistd.h
@@ -0,0 +1,686 @@
+#ifndef _ASM_NIOS_UNISTD_H_
+#define _ASM_NIOS_UNISTD_H_
@@ -12758,8 +12758,8 @@
+#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
+
+#endif /* _ASM_NIOS_UNISTD_H_ */
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/user.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/user.h 2004-05-11 08:07:50.000000000 +0200
+--- linux/include/asm-nios2nommu/user.h
++++ linux/include/asm-nios2nommu/user.h
@@ -0,0 +1,112 @@
+#ifndef _NIOS2NOMMU_USER_H
+#define _NIOS2NOMMU_USER_H
@@ -12873,8 +12873,8 @@
+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
+
+#endif
---- linux-libc-headers-2.6.9.1/include/asm-nios2nommu/virtconvert.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-libc-headers-2.6.9.1-nios2/include/asm-nios2nommu/virtconvert.h 2005-05-18 20:36:28.000000000 +0200
+--- linux/include/asm-nios2nommu/virtconvert.h
++++ linux/include/asm-nios2nommu/virtconvert.h
@@ -0,0 +1,47 @@
+#ifndef __NIOS_VIRT_CONVERT__
+#define __NIOS_VIRT_CONVERT__