diff options
| author | David Mosberger <davidm@tiger.hpl.hp.com> | 2002-10-31 05:45:26 -0800 |
|---|---|---|
| committer | David Mosberger <davidm@tiger.hpl.hp.com> | 2002-10-31 05:45:26 -0800 |
| commit | a376ed8998bb9006f8a56f660c30fd8be9d0fb7e (patch) | |
| tree | 44ca8443d9618a8d9be4a3884f39659ed26645ca /include | |
| parent | cbbb5f84733012c4691bdb4a713b2b86611b868d (diff) | |
ia64: Sync up with 2.5.45.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/ide.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/page.h | 3 | ||||
| -rw-r--r-- | include/asm-ia64/pgtable.h | 2 | ||||
| -rw-r--r-- | include/asm-ia64/poll.h | 5 | ||||
| -rw-r--r-- | include/asm-ia64/system.h | 5 | ||||
| -rw-r--r-- | include/asm-ia64/unistd.h | 3 |
6 files changed, 14 insertions, 5 deletions
diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h index a46ccf7309b2..93935563b470 100644 --- a/include/asm-ia64/ide.h +++ b/include/asm-ia64/ide.h @@ -83,6 +83,7 @@ ide_init_default_hwifs (void) int index; for(index = 0; index < MAX_HWIFS; index++) { + memset(&hw, 0, sizeof hw); ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, NULL); hw.irq = ide_default_irq(ide_default_io_base(index)); ide_register_hw(&hw, NULL); diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 9d71ddc63bc9..4f956057d17f 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h @@ -30,6 +30,9 @@ #define PAGE_MASK (~(PAGE_SIZE - 1)) #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) +#define PERCPU_PAGE_SHIFT 16 /* log2() of max. size of per-CPU area */ +#define PERCPU_PAGE_SIZE (__IA64_UL_CONST(1) << PERCPU_PAGE_SHIFT) + #ifdef CONFIG_HUGETLB_PAGE # if defined(CONFIG_HUGETLB_PAGE_SIZE_4GB) diff --git a/include/asm-ia64/pgtable.h b/include/asm-ia64/pgtable.h index 7188312004a4..48f118f90290 100644 --- a/include/asm-ia64/pgtable.h +++ b/include/asm-ia64/pgtable.h @@ -202,7 +202,7 @@ ia64_phys_addr_valid (unsigned long addr) #define RGN_MAP_LIMIT ((1UL << (4*PAGE_SHIFT - 12)) - PAGE_SIZE) /* per region addr limit */ #define RGN_KERNEL 7 -#define VMALLOC_START (0xa000000000000000 + 3*PAGE_SIZE) +#define VMALLOC_START (0xa000000000000000 + 3*PERCPU_PAGE_SIZE) #define VMALLOC_VMADDR(x) ((unsigned long)(x)) #define VMALLOC_END (0xa000000000000000 + (1UL << (4*PAGE_SHIFT - 9))) diff --git a/include/asm-ia64/poll.h b/include/asm-ia64/poll.h index c4ecb0e9a360..2e7d710c2cf2 100644 --- a/include/asm-ia64/poll.h +++ b/include/asm-ia64/poll.h @@ -4,8 +4,8 @@ /* * poll(2) bit definitions. Chosen to be compatible with Linux/x86. * - * Copyright (C) 1998, 1999 Hewlett-Packard Co - * Copyright (C) 1998, 1999 David Mosberger-Tang <davidm@hpl.hp.com> + * Copyright (C) 1998, 1999, 2002 Hewlett-Packard Co + * David Mosberger-Tang <davidm@hpl.hp.com> */ #define POLLIN 0x0001 @@ -20,6 +20,7 @@ #define POLLWRNORM 0x0100 #define POLLWRBAND 0x0200 #define POLLMSG 0x0400 +#define POLLREMOVE 0x1000 struct pollfd { int fd; diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h index 85d1c18fff39..34484d0ebd25 100644 --- a/include/asm-ia64/system.h +++ b/include/asm-ia64/system.h @@ -20,8 +20,9 @@ #define KERNEL_START (PAGE_OFFSET + 68*1024*1024) -#define GATE_ADDR (0xa000000000000000 + PAGE_SIZE) -#define PERCPU_ADDR (0xa000000000000000 + 2*PAGE_SIZE) +/* 0xa000000000000000 - 0xa000000000000000+PERCPU_MAX_SIZE remain unmapped */ +#define PERCPU_ADDR (0xa000000000000000 + PERCPU_PAGE_SIZE) +#define GATE_ADDR (0xa000000000000000 + 2*PERCPU_PAGE_SIZE) #ifndef __ASSEMBLY__ diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index 8e7d8ca7085d..a0c540371a9e 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h @@ -232,6 +232,9 @@ #define __NR_io_getevents 1240 #define __NR_io_submit 1241 #define __NR_io_cancel 1242 +#define __NR_epoll_create 1243 +#define __NR_epoll_ctl 1244 +#define __NR_epoll_wait 1245 #if !defined(__ASSEMBLY__) && !defined(ASSEMBLER) |