Commit 95a68937 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://are.twiddle.net/op-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents dfbf23a3 67769a06
...@@ -236,14 +236,15 @@ albacore_init_arch(void) ...@@ -236,14 +236,15 @@ albacore_init_arch(void)
unsigned long size; unsigned long size;
size = initrd_end - initrd_start; 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)) if (!move_initrd(pci_mem))
printk("irongate_init_arch: initrd too big " printk("irongate_init_arch: initrd too big "
"(%ldK)\ndisabling initrd\n", "(%ldK)\ndisabling initrd\n",
size / 1024); size / 1024);
} }
#endif #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 " printk("irongate_init_arch: temporarily reserving "
"region %08lx-%08lx for PCI\n", pci_mem, memtop - 1); "region %08lx-%08lx for PCI\n", pci_mem, memtop - 1);
} }
......
...@@ -279,7 +279,8 @@ setup_memory(void *kernel_end) ...@@ -279,7 +279,8 @@ setup_memory(void *kernel_end)
initrd_end, initrd_end,
phys_to_virt(PFN_PHYS(max_low_pfn))); phys_to_virt(PFN_PHYS(max_low_pfn)));
} else { } 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), virt_to_phys((void *)initrd_start),
INITRD_SIZE); INITRD_SIZE);
} }
...@@ -349,8 +350,8 @@ void __init mem_init(void) ...@@ -349,8 +350,8 @@ void __init mem_init(void)
initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, " printk("Memory: %luk/%luk available (%luk kernel code, %luk reserved, "
"%luk data, %luk init)\n", "%luk data, %luk init)\n",
nr_free_pages() << (PAGE_SHIFT-10), (unsigned long)nr_free_pages() << (PAGE_SHIFT-10),
num_physpages << (PAGE_SHIFT-10), num_physpages << (PAGE_SHIFT-10),
codesize >> 10, codesize >> 10,
reservedpages << (PAGE_SHIFT-10), reservedpages << (PAGE_SHIFT-10),
......
...@@ -36,11 +36,22 @@ static inline unsigned int pci_calc_resource_flags(unsigned int flags) ...@@ -36,11 +36,22 @@ static inline unsigned int pci_calc_resource_flags(unsigned int flags)
/* /*
* Find the extent of a PCI decode.. * Find the extent of a PCI decode..
*/ */
static u32 pci_size(u32 base, unsigned long mask) static u32 pci_size(u32 base, u32 maxbase, unsigned long mask)
{ {
u32 size = mask & base; /* Find the significant bits */ u32 size = mask & maxbase; /* Find the significant bits */
size = size & ~(size-1); /* Get the lowest of them to find the decode size */ if (!size)
return size-1; /* extent = size - 1 */ return 0;
/* Get the lowest of them to find the decode size, and
from that the extent. */
size = (size & ~(size-1)) - 1;
/* base == maxbase can be valid only if the BAR has
already been programmed with all 1s. */
if (base == maxbase && ((base | size) & mask) != mask)
return 0;
return size;
} }
static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
...@@ -63,13 +74,17 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) ...@@ -63,13 +74,17 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
if (l == 0xffffffff) if (l == 0xffffffff)
l = 0; l = 0;
if ((l & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_MEMORY) { if ((l & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_MEMORY) {
sz = pci_size(l, sz, PCI_BASE_ADDRESS_MEM_MASK);
if (!sz)
continue;
res->start = l & PCI_BASE_ADDRESS_MEM_MASK; res->start = l & PCI_BASE_ADDRESS_MEM_MASK;
res->flags |= l & ~PCI_BASE_ADDRESS_MEM_MASK; res->flags |= l & ~PCI_BASE_ADDRESS_MEM_MASK;
sz = pci_size(sz, PCI_BASE_ADDRESS_MEM_MASK);
} else { } else {
sz = pci_size(l, sz, PCI_BASE_ADDRESS_IO_MASK & 0xffff);
if (!sz)
continue;
res->start = l & PCI_BASE_ADDRESS_IO_MASK; res->start = l & PCI_BASE_ADDRESS_IO_MASK;
res->flags |= l & ~PCI_BASE_ADDRESS_IO_MASK; res->flags |= l & ~PCI_BASE_ADDRESS_IO_MASK;
sz = pci_size(sz, PCI_BASE_ADDRESS_IO_MASK & 0xffff);
} }
res->end = res->start + (unsigned long) sz; res->end = res->start + (unsigned long) sz;
res->flags |= pci_calc_resource_flags(l); res->flags |= pci_calc_resource_flags(l);
...@@ -99,6 +114,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) ...@@ -99,6 +114,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
if (rom) { if (rom) {
dev->rom_base_reg = rom; dev->rom_base_reg = rom;
res = &dev->resource[PCI_ROM_RESOURCE]; res = &dev->resource[PCI_ROM_RESOURCE];
res->name = dev->dev.name;
pci_read_config_dword(dev, rom, &l); pci_read_config_dword(dev, rom, &l);
pci_write_config_dword(dev, rom, ~PCI_ROM_ADDRESS_ENABLE); pci_write_config_dword(dev, rom, ~PCI_ROM_ADDRESS_ENABLE);
pci_read_config_dword(dev, rom, &sz); pci_read_config_dword(dev, rom, &sz);
...@@ -106,13 +122,15 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) ...@@ -106,13 +122,15 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
if (l == 0xffffffff) if (l == 0xffffffff)
l = 0; l = 0;
if (sz && sz != 0xffffffff) { if (sz && sz != 0xffffffff) {
res->flags = (l & PCI_ROM_ADDRESS_ENABLE) | sz = pci_size(l, sz, PCI_ROM_ADDRESS_MASK);
IORESOURCE_MEM | IORESOURCE_PREFETCH | IORESOURCE_READONLY | IORESOURCE_CACHEABLE; if (sz) {
res->start = l & PCI_ROM_ADDRESS_MASK; res->flags = (l & PCI_ROM_ADDRESS_ENABLE) |
sz = pci_size(sz, PCI_ROM_ADDRESS_MASK); IORESOURCE_MEM | IORESOURCE_PREFETCH |
res->end = res->start + (unsigned long) sz; IORESOURCE_READONLY | IORESOURCE_CACHEABLE;
res->start = l & PCI_ROM_ADDRESS_MASK;
res->end = res->start + (unsigned long) sz;
}
} }
res->name = dev->dev.name;
} }
} }
......
...@@ -80,6 +80,8 @@ static __inline__ void ide_init_default_hwifs(void) ...@@ -80,6 +80,8 @@ static __inline__ void ide_init_default_hwifs(void)
#endif #endif
} }
#include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASMalpha_IDE_H */ #endif /* __ASMalpha_IDE_H */
...@@ -28,6 +28,8 @@ typedef char * __kernel_caddr_t; ...@@ -28,6 +28,8 @@ typedef char * __kernel_caddr_t;
typedef unsigned long __kernel_sigset_t; /* at least 32 bits */ typedef unsigned long __kernel_sigset_t; /* at least 32 bits */
typedef unsigned short __kernel_uid16_t; typedef unsigned short __kernel_uid16_t;
typedef unsigned short __kernel_gid16_t; typedef unsigned short __kernel_gid16_t;
typedef int __kernel_clockid_t;
typedef int __kernel_timer_t;
typedef struct { typedef struct {
int val[2]; int val[2];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment