ia64: Make v2.5.8-pre3 work on ia64.

diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index 1efa2442d41e3116de12ce0ea00988bc40ecf433..a88c2c3aeb294cb8b5da5c31a0be8c5ade5e4685 100644 (file)
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -47,6 +47,8 @@ static void elf32_set_personality (void);
 #define ELF_PLAT_INIT(_r)              ia64_elf32_init(_r)
 #define setup_arg_pages(bprm)          ia32_setup_arg_pages(bprm)
 #define elf_map                                elf32_map
+
+#undef SET_PERSONALITY
 #define SET_PERSONALITY(ex, ibcs2)     elf32_set_personality()
 
 /* Ugly but avoids duplication */

diff --git a/arch/ia64/kernel/brl_emu.c b/arch/ia64/kernel/brl_emu.c
index abfd6a870976625f5f587e6eb18b8bd4d0703676..6101686da2a927349ef673ab38239a6e82d55d0c 100644 (file)
--- a/arch/ia64/kernel/brl_emu.c
+++ b/arch/ia64/kernel/brl_emu.c
@@ -55,7 +55,7 @@ struct illegal_op_return
 ia64_emulate_brl (struct pt_regs *regs, unsigned long ar_ec)
 {
        unsigned long bundle[2];
-       unsigned long opcode, btype, qp, offset;
+       unsigned long opcode, btype, qp, offset, cpl;
        unsigned long next_ip;
        struct siginfo siginfo;
        struct illegal_op_return rv;
@@ -158,9 +158,9 @@ ia64_emulate_brl (struct pt_regs *regs, unsigned long ar_ec)
                         *  AR[PFS].pec = AR[EC]
                         *  AR[PFS].ppl = PSR.cpl
                         */
+                       cpl = ia64_psr(regs)->cpl;
                        regs->ar_pfs = ((regs->cr_ifs & 0x3fffffffff)
-                                       | (ar_ec << 52)
-                                       | ((unsigned long) ia64_psr(regs)->cpl << 62));
+                                       | (ar_ec << 52) | (cpl << 62));
 
                        /*
                         *  CFM.sof -= CFM.sol

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 9afd230b219e4209eb64d9e3e17813658c37c956..5760abe91602076e4c0ff46c2aed2d0f845910a0 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -36,6 +36,7 @@
 #include <asm/kregs.h>
 #include <asm/offsets.h>
 #include <asm/pgtable.h>
+#include <asm/percpu.h>
 #include <asm/processor.h>
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
@@ -1208,8 +1209,8 @@ sys_call_table:
        data8 sys_fremovexattr
        data8 sys_tkill
        data8 sys_futex                         // 1230
-       data8 ia64_ni_syscall
-       data8 ia64_ni_syscall
+       data8 sys_sched_setaffinity
+       data8 sys_sched_getaffinity
        data8 ia64_ni_syscall
        data8 ia64_ni_syscall
        data8 ia64_ni_syscall                   // 1235

diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
index 2bb50599f4670402887e7704e1ad73523f25d897..241b84d46f2d62e606d741d2999d58a58a2e25f9 100644 (file)
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@ -67,7 +67,7 @@ EXPORT_SYMBOL(kernel_thread);
 EXPORT_SYMBOL(last_cli_ip);
 #endif
 
-#include <asm/pgalloc.h>
+#include <asm/tlbflush.h>
 
 EXPORT_SYMBOL(flush_tlb_range);
 

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index bba2863cf75a1999d67b4000f787672d9a40fbd1..81187abfde62ed3187c5950207c8dd2a7169c075 100644 (file)
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -353,7 +353,9 @@ static int
 verify_guid (efi_guid_t *test, efi_guid_t *target)
 {
        int     rc;
+#ifdef IA64_MCA_DEBUG_INFO
        char out[40];
+#endif
 
        if ((rc = efi_guidcmp(*test, *target))) {
                IA64_MCA_DEBUG(KERN_DEBUG

diff --git a/arch/ia64/kernel/pci.c b/arch/ia64/kernel/pci.c
index 921546ddfb05a5102fed2ac5617e4ec1f20e9a8e..3a4725bace0b3afb4354971d421b9ae8f72f4df1 100644 (file)
--- a/arch/ia64/kernel/pci.c
+++ b/arch/ia64/kernel/pci.c
@@ -273,9 +273,7 @@ pcibios_enable_device (struct pci_dev *dev)
 
        /* Not needed, since we enable all devices at startup.  */
 
-       printk(KERN_INFO "PCI: Found IRQ %d for device %s\n", dev->irq, 
-               dev->slot_name);
-
+       printk(KERN_INFO "PCI: Found IRQ %d for device %s\n", dev->irq, dev->slot_name);
        return 0;
 }
 

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 7bf6855cc198d31740e5ea9b83d87f60f188b6e3..abb43c7f2a5049c5b675ba83fd21a52a3816abd0 100644 (file)
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -24,7 +24,7 @@
 #include <asm/efi.h>
 #include <asm/elf.h>
 #include <asm/perfmon.h>
-#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
 #include <asm/processor.h>
 #include <asm/sal.h>
 #include <asm/uaccess.h>
@@ -145,7 +145,7 @@ do_notify_resume_user (sigset_t *oldset, struct sigscratch *scr, long in_syscall
 /*
  * We use this if we don't have any better idle routine..
  */
-static void
+void
 default_idle (void)
 {
        /* may want to do PAL_LIGHT_HALT here... */
@@ -660,7 +660,7 @@ dup_task_struct(struct task_struct *orig)
 {
        struct task_struct *tsk;
 
-       tsk = __get_free_pages(GFP_KERNEL, KERNEL_STACK_SIZE_ORDER);
+       tsk = (void *) __get_free_pages(GFP_KERNEL, KERNEL_STACK_SIZE_ORDER);
        if (!tsk)
                return NULL;
 

diff --git a/arch/ia64/kernel/semaphore.c b/arch/ia64/kernel/semaphore.c
index da6de324a5706eafb397eefd65f6b53097cacc51..0a2082fb17b19d671b48b6f8f22dc8e497e73efc 100644 (file)
--- a/arch/ia64/kernel/semaphore.c
+++ b/arch/ia64/kernel/semaphore.c
@@ -1,8 +1,8 @@
 /*
  * IA-64 semaphore implementation (derived from x86 version).
  *
- * Copyright (C) 1999-2000 Hewlett-Packard Co
- * Copyright (C) 1999-2000 David Mosberger-Tang <davidm@hpl.hp.com>
+ * Copyright (C) 1999-2000, 2002 Hewlett-Packard Co
+ *     David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
 /*
@@ -25,6 +25,7 @@
  */
 #include <linux/sched.h>
 
+#include <asm/errno.h>
 #include <asm/semaphore.h>
 
 /*

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index e167bb45185c6aa2edbbf498761c316da4079cd0..c3d8f071dca8fae557d54bfb123f5bf6e764f687 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -54,7 +54,10 @@
 
 extern char _end;
 
+#ifdef CONFIG_SMP
 unsigned long __per_cpu_offset[NR_CPUS];
+#endif
+
 struct cpuinfo_ia64 cpu_info __per_cpu_data;
 
 unsigned long ia64_phys_stacked_size_p8;
@@ -527,20 +530,25 @@ setup_per_cpu_areas (void)
 void
 cpu_init (void)
 {
-       extern char __per_cpu_start[], __phys_per_cpu_start[], __per_cpu_end[];
+       extern char __per_cpu_start[], __phys_per_cpu_start[];
        extern void __init ia64_mmu_init (void *);
        unsigned long num_phys_stacked;
        pal_vm_info_2_u_t vmi;
        unsigned int max_ctx;
        struct cpuinfo_ia64 *my_cpu_info;
        void *my_cpu_data;
+
+#ifdef CONFIG_SMP
+       extern char __per_cpu_end[];
        int cpu = smp_processor_id();
 
        my_cpu_data = alloc_bootmem_pages(__per_cpu_end - __per_cpu_start);
        memcpy(my_cpu_data, __phys_per_cpu_start, __per_cpu_end - __per_cpu_start);
-
        __per_cpu_offset[cpu] = (char *) my_cpu_data - __per_cpu_start;
-
+       my_cpu_info = my_cpu_data + ((char *) &cpu_info - __per_cpu_start);
+#else
+       my_cpu_data = __phys_per_cpu_start;
+#endif
        my_cpu_info = my_cpu_data + ((char *) &cpu_info - __per_cpu_start);
 
        /*

diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
index 80798577c61fad5b060e755892ab3f3d3d61fc73..fa230acc7cffee77d1f76771653c697fc5e1e6d5 100644 (file)
--- a/arch/ia64/kernel/sys_ia64.c
+++ b/arch/ia64/kernel/sys_ia64.c
@@ -47,7 +47,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
                /* At this point:  (!vmm || addr < vmm->vm_end). */
                if (TASK_SIZE - len < addr)
                        return -ENOMEM;
-               if (rgn_offset(addr) + len > RGN_MAP_LIMIT)     /* no risk of overflow here... */
+               if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)  /* no risk of overflow here... */
                        return -ENOMEM;
                if (!vmm || addr + len <= vmm->vm_start)
                        return addr;
@@ -126,7 +126,7 @@ ia64_brk (unsigned long brk, long arg1, long arg2, long arg3,
        }
 
        /* Check against unimplemented/unmapped addresses: */
-       if ((newbrk - oldbrk) > RGN_MAP_LIMIT || rgn_offset(newbrk) > RGN_MAP_LIMIT)
+       if ((newbrk - oldbrk) > RGN_MAP_LIMIT || REGION_OFFSET(newbrk) > RGN_MAP_LIMIT)
                goto out;
 
        /* Check against rlimit.. */
@@ -206,7 +206,7 @@ do_mmap2 (unsigned long addr, unsigned long len, int prot, int flags, int fd, un
         * or across a region boundary.  Note: RGN_MAP_LIMIT is equal to 2^n-PAGE_SIZE
         * (for some integer n <= 61) and len > 0.
         */
-       roff = rgn_offset(addr);
+       roff = REGION_OFFSET(addr);
        if ((len > RGN_MAP_LIMIT) || (roff > (RGN_MAP_LIMIT - len))) {
                addr = -EINVAL;
                goto out;

diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index b3c75b7fea6f793c75806d99247deee19f70ae04..aa84967115660c943046c430541406340681dd45 100644 (file)
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -120,15 +120,15 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
        if (!(prev_vma && (prev_vma->vm_flags & VM_GROWSUP) && (address == prev_vma->vm_end))) {
                if (!(vma->vm_flags & VM_GROWSDOWN))
                        goto bad_area;
-               if (rgn_index(address) != rgn_index(vma->vm_start)
-                   || rgn_offset(address) >= RGN_MAP_LIMIT)
+               if (REGION_NUMBER(address) != REGION_NUMBER(vma->vm_start)
+                   || REGION_OFFSET(address) >= RGN_MAP_LIMIT)
                        goto bad_area;
                if (expand_stack(vma, address))
                        goto bad_area;
        } else {
                vma = prev_vma;
-               if (rgn_index(address) != rgn_index(vma->vm_start)
-                   || rgn_offset(address) >= RGN_MAP_LIMIT)
+               if (REGION_NUMBER(address) != REGION_NUMBER(vma->vm_start)
+                   || REGION_OFFSET(address) >= RGN_MAP_LIMIT)
                        goto bad_area;
                if (expand_backing_store(vma, address))
                        goto bad_area;

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index a5d26ac2df2e771ec9edbe8914c0193ca582fd8c..0b27c4561fc7291623f935844576f4fa7b9fa097 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -40,10 +40,10 @@ static unsigned long totalram_pages;
 
 static int pgt_cache_water[2] = { 25, 50 };
 
-int
+void
 check_pgt_cache (void)
 {
-       int low, high, freed = 0;
+       int low, high;
 
        low = pgt_cache_water[0];
        high = pgt_cache_water[1];
@@ -51,12 +51,11 @@ check_pgt_cache (void)
        if (pgtable_cache_size > high) {
                do {
                        if (pgd_quicklist)
-                               free_page((unsigned long)pgd_alloc_one_fast(0)), ++freed;
+                               free_page((unsigned long)pgd_alloc_one_fast(0));
                        if (pmd_quicklist)
-                               free_page((unsigned long)pmd_alloc_one_fast(0, 0)), ++freed;
+                               free_page((unsigned long)pmd_alloc_one_fast(0, 0));
                } while (pgtable_cache_size > low);
        }
-       return freed;
 }
 
 /*

diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index 6bffee9ab5eba8eb5e7536a84f4ee904ced6cbf0..19fe60e5fb71cc01d8f3c1e821f7c4c3e8dc66e2 100644 (file)
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -16,10 +16,11 @@
 #include <linux/smp.h>
 #include <linux/mm.h>
 
+#include <asm/delay.h>
 #include <asm/mmu_context.h>
 #include <asm/pgalloc.h>
 #include <asm/pal.h>
-#include <asm/delay.h>
+#include <asm/tlbflush.h>
 
 #define SUPPORTED_PGBITS (                     \
                1 << _PAGE_SIZE_256M |          \

diff --git a/include/asm-ia64/cacheflush.h b/include/asm-ia64/cacheflush.h
index d1f321760a4f75c441e4a2b88d8464c7a877d122..025398be93bc28edbadfce45a38aad1e018b3887 100644 (file)
--- a/include/asm-ia64/cacheflush.h
+++ b/include/asm-ia64/cacheflush.h
@@ -6,8 +6,6 @@
  *     David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
-#include <linux/mm.h>
-
 #include <asm/bitops.h>
 #include <asm/page.h>
 
@@ -30,10 +28,10 @@ do {                                                \
 
 extern void flush_icache_range (unsigned long start, unsigned long end);
 
-#define flush_icache_user_range(vma, page, user_addr, len)                     \
-do {                                                                           \
-       unsigned long _addr = page_address(page) + ((user_addr) & ~PAGE_MASK);  \
-       flush_icache_range(_addr, _addr + (len));                               \
+#define flush_icache_user_range(vma, page, user_addr, len)                                     \
+do {                                                                                           \
+       unsigned long _addr = (unsigned long) page_address(page) + ((user_addr) & ~PAGE_MASK);  \
+       flush_icache_range(_addr, _addr + (len));                                               \
 } while (0)
 
 #endif /* _ASM_IA64_CACHEFLUSH_H */

diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h
index 697c2c51bc7f124a822f6429f2a36b414c5e3a12..336132c199f827435bbd385cd067b9b87b7e52a8 100644 (file)
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -31,14 +31,14 @@ static __inline__ int
 ide_default_irq (ide_ioreg_t base)
 {
        switch (base) {
-               case 0x1f0: return isa_irq_to_vector(14);
-               case 0x170: return isa_irq_to_vector(15);
-               case 0x1e8: return isa_irq_to_vector(11);
-               case 0x168: return isa_irq_to_vector(10);
-               case 0x1e0: return isa_irq_to_vector(8);
-               case 0x160: return isa_irq_to_vector(12);
-               default:
-                       return 0;
+             case 0x1f0: return isa_irq_to_vector(14);
+             case 0x170: return isa_irq_to_vector(15);
+             case 0x1e8: return isa_irq_to_vector(11);
+             case 0x168: return isa_irq_to_vector(10);
+             case 0x1e0: return isa_irq_to_vector(8);
+             case 0x160: return isa_irq_to_vector(12);
+             default:
+               return 0;
        }
 }
 
@@ -46,14 +46,14 @@ static __inline__ ide_ioreg_t
 ide_default_io_base (int index)
 {
        switch (index) {
-               case 0: return 0x1f0;
-               case 1: return 0x170;
-               case 2: return 0x1e8;
-               case 3: return 0x168;
-               case 4: return 0x1e0;
-               case 5: return 0x160;
-               default:
-                       return 0;
+             case 0: return 0x1f0;
+             case 1: return 0x170;
+             case 2: return 0x1e8;
+             case 3: return 0x168;
+             case 4: return 0x1e0;
+             case 5: return 0x160;
+             default:
+               return 0;
        }
 }
 

diff --git a/include/asm-ia64/pgalloc.h b/include/asm-ia64/pgalloc.h
index 3028940030592fb86bd1a4d3fb140807ae177040..9d0740f2e4558398b65c3a50d29fc8375e8fb920 100644 (file)
--- a/include/asm-ia64/pgalloc.h
+++ b/include/asm-ia64/pgalloc.h
@@ -150,6 +150,31 @@ pte_free_kernel (pte_t *pte)
        free_page((unsigned long) pte);
 }
 
-extern int do_check_pgt_cache (int, int);
+extern void check_pgt_cache (void);
+
+/*
+ * IA-64 doesn't have any external MMU info: the page tables contain all the necessary
+ * information.  However, we use this macro to take care of any (delayed) i-cache flushing
+ * that may be necessary.
+ */
+static inline void
+update_mmu_cache (struct vm_area_struct *vma, unsigned long vaddr, pte_t pte)
+{
+       unsigned long addr;
+       struct page *page;
+
+       if (!pte_exec(pte))
+               return;                         /* not an executable page... */
+
+       page = pte_page(pte);
+       /* don't use VADDR: it may not be mapped on this CPU (or may have just been flushed): */
+       addr = (unsigned long) page_address(page);
+
+       if (test_bit(PG_arch_1, &page->flags))
+               return;                         /* i-cache is already coherent with d-cache */
+
+       flush_icache_range(addr, addr + PAGE_SIZE);
+       set_bit(PG_arch_1, &page->flags);       /* mark page as clean */
+}
 
 #endif /* _ASM_IA64_PGALLOC_H */

diff --git a/include/asm-ia64/pgtable.h b/include/asm-ia64/pgtable.h
index 977b9deec699b39526abcea2104dc9e3a3da9f06..f4f92435627e37ccad348fcf4c89d1c47a707e97 100644 (file)
--- a/include/asm-ia64/pgtable.h
+++ b/include/asm-ia64/pgtable.h
@@ -14,7 +14,6 @@
 
 #include <linux/config.h>
 
-#include <asm/cacheflush.h>
 #include <asm/mman.h>
 #include <asm/page.h>
 #include <asm/processor.h>
@@ -122,6 +121,7 @@
 # ifndef __ASSEMBLY__
 
 #include <asm/bitops.h>
+#include <asm/cacheflush.h>
 #include <asm/mmu_context.h>
 #include <asm/processor.h>
 
@@ -406,31 +406,6 @@ pte_same (pte_t a, pte_t b)
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
 extern void paging_init (void);
 
-/*
- * IA-64 doesn't have any external MMU info: the page tables contain all the necessary
- * information.  However, we use this macro to take care of any (delayed) i-cache flushing
- * that may be necessary.
- */
-static inline void
-update_mmu_cache (struct vm_area_struct *vma, unsigned long vaddr, pte_t pte)
-{
-       unsigned long addr;
-       struct page *page;
-
-       if (!pte_exec(pte))
-               return;                         /* not an executable page... */
-
-       page = pte_page(pte);
-       /* don't use VADDR: it may not be mapped on this CPU (or may have just been flushed): */
-       addr = (unsigned long) page_address(page);
-
-       if (test_bit(PG_arch_1, &page->flags))
-               return;                         /* i-cache is already coherent with d-cache */
-
-       flush_icache_range(addr, addr + PAGE_SIZE);
-       set_bit(PG_arch_1, &page->flags);       /* mark page as clean */
-}
-
 #define SWP_TYPE(entry)                        (((entry).val >> 1) & 0xff)
 #define SWP_OFFSET(entry)              (((entry).val << 1) >> 10)
 #define SWP_ENTRY(type,offset)         ((swp_entry_t) { ((type) << 1) | ((long) (offset) << 9) })

diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index 8713f2544632539cfc00378767da15bd6298d3cb..8abb0d56e0dabda4e7775c3e36333f70196de33e 100644 (file)
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -15,7 +15,7 @@
 
 #include <linux/config.h>
 
-#include <linux/compiler.h>
+#include <linux/percpu.h>
 
 #include <asm/ptrace.h>
 #include <asm/kregs.h>
@@ -186,10 +186,6 @@
  */
 #define IA64_USEC_PER_CYC_SHIFT        41
 
-#define __HAVE_ARCH_PER_CPU
-
-#define THIS_CPU(var)  (var)
-
 #ifndef __ASSEMBLY__
 
 #include <linux/threads.h>
@@ -202,11 +198,6 @@
 #include <asm/unwind.h>
 #include <asm/atomic.h>
 
-extern unsigned long __per_cpu_offset[NR_CPUS];
-
-#define per_cpu(var, cpu)      (*(__typeof__(&(var))) ((void *) &(var) + __per_cpu_offset[cpu]))
-#define this_cpu(var)          (var)
-
 /* like above but expressed as bitfields for more efficient access: */
 struct ia64_psr {
        __u64 reserved0 : 1;

diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h
index 1934edc70e0091aa300c8811d40e78218088a019..70962f85c2732e8dce64bb9f9663fcf12ef95d1c 100644 (file)
--- a/include/asm-ia64/thread_info.h
+++ b/include/asm-ia64/thread_info.h
@@ -15,6 +15,8 @@
 #define TI_ADDR_LIMIT  0x10
 #define TI_PRE_COUNT   0x18
 
+#define PREEMPT_ACTIVE 0x4000000
+
 #ifndef __ASSEMBLY__
 
 /*

diff --git a/include/asm-ia64/uaccess.h b/include/asm-ia64/uaccess.h
index 965aecc95e66d09a53efb2393186fa41f8547b16..afe47af459bc45ef9e12cafc220afaf21e05c39d 100644 (file)
--- a/include/asm-ia64/uaccess.h
+++ b/include/asm-ia64/uaccess.h
@@ -56,8 +56,9 @@
  * address TASK_SIZE is never valid.  We also need to make sure that the address doesn't
  * point inside the virtually mapped linear page table.
  */
-#define __access_ok(addr,size,segment) (((unsigned long) (addr)) <= (segment).seg              \
-        && ((segment).seg == KERNEL_DS.seg || rgn_offset((unsigned long) (addr)) < RGN_MAP_LIMIT))
+#define __access_ok(addr,size,segment) (((unsigned long) (addr)) <= (segment).seg      \
+        && ((segment).seg == KERNEL_DS.seg                                             \
+            || REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))
 #define access_ok(type,addr,size)      __access_ok((addr),(size),get_fs())
 
 static inline int

diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index 3857cffbeb61699ba73e3d317092dbe46d5a6753..48b175af1b08ab9241afcf3f2c66152cbc948c64 100644 (file)
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -220,6 +220,8 @@
 #define __NR_fremovexattr              1228
 #define __NR_tkill                     1229
 #define __NR_futex                     1230
+#define __NR_sched_setaffinity         1231
+#define __NR_sched_getaffinity         1232
 
 #if !defined(__ASSEMBLY__) && !defined(ASSEMBLER)
 

diff --git a/include/linux/acpi_serial.h b/include/linux/acpi_serial.h
index c48e64ae12a9bbeb04d619589b7850fff5691532..07fb16f5a2b3ce5250bf4163c9ddc00ada51b5c0 100644 (file)
--- a/include/linux/acpi_serial.h
+++ b/include/linux/acpi_serial.h
@@ -11,6 +11,8 @@
 
 extern void setup_serial_acpi(void *);
 
+#define ACPI_SIG_LEN           4
+
 /* ACPI table signatures */
 #define ACPI_SPCRT_SIGNATURE   "SPCR"
 #define ACPI_DBGPT_SIGNATURE   "DBGP"