diff options
| -rw-r--r-- | arch/alpha/kernel/core_irongate.c | 5 | ||||
| -rw-r--r-- | arch/alpha/mm/numa.c | 7 | ||||
| -rw-r--r-- | include/asm-alpha/ide.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/posix_types.h | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c index 4aabddb49485..3ce8877195f6 100644 --- a/arch/alpha/kernel/core_irongate.c +++ b/arch/alpha/kernel/core_irongate.c @@ -236,14 +236,15 @@ albacore_init_arch(void) unsigned long size; size = initrd_end - initrd_start; - free_bootmem(__pa(initrd_start), PAGE_ALIGN(size)); + free_bootmem_node(NODE_DATA(0), __pa(initrd_start), + PAGE_ALIGN(size)); if (!move_initrd(pci_mem)) printk("irongate_init_arch: initrd too big " "(%ldK)\ndisabling initrd\n", size / 1024); } #endif - reserve_bootmem(pci_mem, memtop - pci_mem); + reserve_bootmem_node(NODE_DATA(0), pci_mem, memtop - pci_mem); printk("irongate_init_arch: temporarily reserving " "region %08lx-%08lx for PCI\n", pci_mem, memtop - 1); } diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index 152eac7c2c37..b7618f261b89 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c @@ -279,7 +279,8 @@ setup_memory(void *kernel_end) initrd_end, phys_to_virt(PFN_PHYS(max_low_pfn))); } else { - reserve_bootmem_node(NODE_DATA(KVADDR_TO_NID(initrd_start)), + nid = NODE_DATA(kvaddr_to_nid(initrd_start)); + reserve_bootmem_node(nid, virt_to_phys((void *)initrd_start), INITRD_SIZE); } @@ -349,8 +350,8 @@ void __init mem_init(void) initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, " - "%luk data, %luk init)\n", - nr_free_pages() << (PAGE_SHIFT-10), + "%luk data, %luk init)\n", + (unsigned long)nr_free_pages() << (PAGE_SHIFT-10), num_physpages << (PAGE_SHIFT-10), codesize >> 10, reservedpages << (PAGE_SHIFT-10), diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h index 62d620539a07..bf5b19788cd9 100644 --- a/include/asm-alpha/ide.h +++ b/include/asm-alpha/ide.h @@ -80,6 +80,8 @@ static __inline__ void ide_init_default_hwifs(void) #endif } +#include <asm-generic/ide_iops.h> + #endif /* __KERNEL__ */ #endif /* __ASMalpha_IDE_H */ diff --git a/include/asm-alpha/posix_types.h b/include/asm-alpha/posix_types.h index ae871df5cefa..723efbe8a5ed 100644 --- a/include/asm-alpha/posix_types.h +++ b/include/asm-alpha/posix_types.h @@ -28,6 +28,8 @@ typedef char * __kernel_caddr_t; typedef unsigned long __kernel_sigset_t; /* at least 32 bits */ typedef unsigned short __kernel_uid16_t; typedef unsigned short __kernel_gid16_t; +typedef int __kernel_clockid_t; +typedef int __kernel_timer_t; typedef struct { int val[2]; |