Subject: 2.3.18
From: Richard Henderson (rth@twiddle.net)
Date: Tue Sep 14 1999 - 04:20:28 PDT
Well, not actually 2.3.18, but whatever's in vger's cvs, which
is probably close enough. It's been tried on pc164 and dp264.
r~
Index: arch/alpha/kernel/core_cia.c
===================================================================
RCS file: /disk1/u4/cvs/linux/arch/alpha/kernel/core_cia.c,v
retrieving revision 1.6
diff -c -p -d -r1.6 core_cia.c
*** core_cia.c 1999/09/08 03:38:53 1.6
--- core_cia.c 1999/09/14 11:06:56
*************** cia_init_arch(unsigned long *mem_start,
*** 433,441 ****
hose->config_space = CIA_CONF;
hose->index = 0;
hae_mem->start = 0;
hae_mem->end = CIA_MEM_R1_MASK;
! hae_mem->name = pci_hae0_name;
request_resource(&iomem_resource, hae_mem);
}
--- 433,442 ----
hose->config_space = CIA_CONF;
hose->index = 0;
+ hae_mem->name = pci_hae0_name;
hae_mem->start = 0;
hae_mem->end = CIA_MEM_R1_MASK;
! hae_mem->flags = IORESOURCE_MEM;
request_resource(&iomem_resource, hae_mem);
}
Index: arch/alpha/kernel/core_mcpcia.c
===================================================================
RCS file: /disk1/u4/cvs/linux/arch/alpha/kernel/core_mcpcia.c,v
retrieving revision 1.6
diff -c -p -d -r1.6 core_mcpcia.c
*** core_mcpcia.c 1999/09/08 03:38:55 1.6
--- core_mcpcia.c 1999/09/14 11:06:56
*************** mcpcia_new_hose(unsigned long *mem_start
*** 344,360 ****
hose->config_space = MCPCIA_CONF(mid);
hose->index = h;
io->start = MCPCIA_IO(mid) - MCPCIA_IO_BIAS;
io->end = io->start + 0xffff;
! io->name = pci_io_names[h];
mem->start = MCPCIA_DENSE(mid) - MCPCIA_MEM_BIAS;
mem->end = mem->start + 0xffffffff;
! mem->name = pci_mem_names[h];
hae_mem->start = mem->start;
hae_mem->end = mem->start + MCPCIA_MEM_MASK;
! hae_mem->name = pci_hae0_name;
request_resource(&ioport_resource, io);
request_resource(&iomem_resource, mem);
--- 344,363 ----
hose->config_space = MCPCIA_CONF(mid);
hose->index = h;
+ io->name = pci_io_names[h];
io->start = MCPCIA_IO(mid) - MCPCIA_IO_BIAS;
io->end = io->start + 0xffff;
! io->flags = IORESOURCE_IO;
+ mem->name = pci_mem_names[h];
mem->start = MCPCIA_DENSE(mid) - MCPCIA_MEM_BIAS;
mem->end = mem->start + 0xffffffff;
! mem->flags = IORESOURCE_MEM;
+ hae_mem->name = pci_hae0_name;
hae_mem->start = mem->start;
hae_mem->end = mem->start + MCPCIA_MEM_MASK;
! hae_mem->flags = IORESOURCE_MEM;
request_resource(&ioport_resource, io);
request_resource(&iomem_resource, mem);
Index: arch/alpha/kernel/core_tsunami.c
===================================================================
RCS file: /disk1/u4/cvs/linux/arch/alpha/kernel/core_tsunami.c,v
retrieving revision 1.6
diff -c -p -d -r1.6 core_tsunami.c
*** core_tsunami.c 1999/09/08 03:38:58 1.6
--- core_tsunami.c 1999/09/14 11:06:57
*************** tsunami_init_one_pchip(tsunami_pchip *pc
*** 248,274 ****
unsigned long *mem_start)
{
struct pci_controler *hose;
if (tsunami_probe_read(&pchip->pctl.csr) == 0)
return;
hose = alloc_pci_controler(mem_start);
! hose->io_space = alloc_resource(mem_start);
! hose->mem_space = alloc_resource(mem_start);
hose->config_space = TSUNAMI_CONF(index);
hose->index = index;
! hose->io_space->start = TSUNAMI_IO(index) - TSUNAMI_IO_BIAS;
! hose->io_space->end = hose->io_space->start + 0xffff;
! hose->io_space->name = pci_io_names[index];
! hose->mem_space->start = TSUNAMI_MEM(index) - TSUNAMI_MEM_BIAS;
! hose->mem_space->end = hose->mem_space->start + 0xffffffff;
! hose->mem_space->name = pci_mem_names[index];
! request_resource(&ioport_resource, hose->io_space);
! request_resource(&iomem_resource, hose->mem_space);
/*
* Set up the PCI->physical memory translation windows.
--- 248,277 ----
unsigned long *mem_start)
{
struct pci_controler *hose;
+ struct resource *io, *mem;
if (tsunami_probe_read(&pchip->pctl.csr) == 0)
return;
hose = alloc_pci_controler(mem_start);
! hose->io_space = io = alloc_resource(mem_start);
! hose->mem_space = mem = alloc_resource(mem_start);
hose->config_space = TSUNAMI_CONF(index);
hose->index = index;
! io->name = pci_io_names[index];
! io->start = TSUNAMI_IO(index) - TSUNAMI_IO_BIAS;
! io->end = io->start + 0xffff;
! io->flags = IORESOURCE_IO;
! mem->name = pci_mem_names[index];
! mem->start = TSUNAMI_MEM(index) - TSUNAMI_MEM_BIAS;
! mem->end = mem->start + 0xffffffff;
! mem->flags = IORESOURCE_MEM;
! request_resource(&ioport_resource, io);
! request_resource(&iomem_resource, io);
/*
* Set up the PCI->physical memory translation windows.
Index: arch/alpha/kernel/entry.S
===================================================================
RCS file: /disk1/u4/cvs/linux/arch/alpha/kernel/entry.S,v
retrieving revision 1.56
diff -c -p -d -r1.56 entry.S
*** entry.S 1999/09/08 03:38:59 1.56
--- entry.S 1999/09/14 11:06:57
***************
*** 8,14 ****
#define SIGCHLD 20
! #define NR_SYSCALLS 373
/*
* These offsets must match with alpha_mv in <asm/machvec.h>.
--- 8,14 ----
#define SIGCHLD 20
! #define NR_SYSCALLS 374
/*
* These offsets must match with alpha_mv in <asm/machvec.h>.
*************** sys_call_table:
*** 1149,1151 ****
--- 1149,1152 ----
.quad sys_sendfile /* 370 */
.quad sys_setresgid
.quad sys_getresgid
+ .quad sys_ni_syscall /* sys_dipc */
Index: arch/alpha/kernel/process.c
===================================================================
RCS file: /disk1/u4/cvs/linux/arch/alpha/kernel/process.c,v
retrieving revision 1.39
diff -c -p -d -r1.39 process.c
*** process.c 1999/08/31 05:52:18 1.39
--- process.c 1999/09/14 11:06:57
*************** void flush_thread(void)
*** 236,245 ****
wrfpcr(FPCR_DYN_NORMAL | FPCR_INVD | FPCR_DZED | FPCR_OVFD | FPCR_INED);
}
- void release_thread(struct task_struct *dead_task)
- {
- }
-
/*
* "alpha_clone()".. By the time we get here, the
* non-volatile registers have also been saved on the
--- 236,241 ----
Index: drivers/pci/pci.c
===================================================================
RCS file: /disk1/u4/cvs/linux/drivers/pci/pci.c,v
retrieving revision 1.104
diff -c -p -d -r1.104 pci.c
*** pci.c 1999/09/10 10:41:42 1.104
--- pci.c 1999/09/14 11:06:58
*************** pci_find_capability(struct pci_dev *dev,
*** 119,125 ****
* it should be allocated from.
*/
struct resource *
! pci_find_parent_resource(struct pci_dev *dev, struct resource *res)
{
struct pci_bus *bus = dev->bus;
int i;
--- 119,126 ----
* it should be allocated from.
*/
struct resource *
! pci_find_parent_resource(struct pci_dev *dev, struct resource *res,
! int check_contained)
{
struct pci_bus *bus = dev->bus;
int i;
*************** pci_find_parent_resource(struct pci_dev
*** 130,136 ****
struct resource *r = bus->resource[i];
if (!r)
continue;
! if (res->start && !(res->start >= r->start && res->end <= r->end))
continue; /* Not contained */
if ((res->flags ^ r->flags) & (IORESOURCE_IO | IORESOURCE_MEM))
continue; /* Wrong type */
--- 131,140 ----
struct resource *r = bus->resource[i];
if (!r)
continue;
! if (check_contained
! && res->start
! && !(res->start >= r->start
! && res->end <= r->end))
continue; /* Not contained */
if ((res->flags ^ r->flags) & (IORESOURCE_IO | IORESOURCE_MEM))
continue; /* Wrong type */
*************** pci_set_master(struct pci_dev *dev)
*** 214,220 ****
int __init pci_assign_resource(struct pci_dev *dev, int i)
{
struct resource *r = &dev->resource[i];
! struct resource *pr = pci_find_parent_resource(dev, r);
unsigned long size = r->end + 1;
if (!pr)
--- 218,224 ----
int __init pci_assign_resource(struct pci_dev *dev, int i)
{
struct resource *r = &dev->resource[i];
! struct resource *pr = pci_find_parent_resource(dev, r, 0);
unsigned long size = r->end + 1;
if (!pr)
Index: drivers/pci/setup.c
===================================================================
RCS file: /disk1/u4/cvs/linux/drivers/pci/setup.c,v
retrieving revision 1.2
diff -c -p -d -r1.2 setup.c
*** setup.c 1999/09/10 10:41:43 1.2
--- setup.c 1999/09/14 11:06:58
*************** int __init
*** 30,36 ****
pci_claim_resource(struct pci_dev *dev, int resource)
{
struct resource *res = &dev->resource[resource];
! struct resource *root = pci_find_parent_resource(dev, res);
int err;
err = -EINVAL;
--- 30,36 ----
pci_claim_resource(struct pci_dev *dev, int resource)
{
struct resource *res = &dev->resource[resource];
! struct resource *root = pci_find_parent_resource(dev, res, 1);
int err;
err = -EINVAL;
*************** pdev_assign_unassigned_resources(struct
*** 79,85 ****
continue;
/* Determine the root we allocate from. */
! root = pci_find_parent_resource(dev, res);
if (root == NULL)
continue;
--- 79,85 ----
continue;
/* Determine the root we allocate from. */
! root = pci_find_parent_resource(dev, res, 0);
if (root == NULL)
continue;
Index: drivers/video/tgafb.c
===================================================================
RCS file: /disk1/u4/cvs/linux/drivers/video/tgafb.c,v
retrieving revision 1.35
diff -c -p -d -r1.35 tgafb.c
*** tgafb.c 1999/08/31 06:59:14 1.35
--- tgafb.c 1999/09/14 11:06:58
*************** static int tgafb_blank(int blank, struct
*** 937,943 ****
static void tgafb_set_disp(const void *fb_par, struct display *disp,
struct fb_info_gen *info)
{
! disp->screen_base = ioremap(fb_info.tga_fb_base);
switch (fb_info.tga_type) {
#ifdef FBCON_HAS_CFB8
case 0: /* 8-plane */
--- 937,943 ----
static void tgafb_set_disp(const void *fb_par, struct display *disp,
struct fb_info_gen *info)
{
! disp->screen_base = ioremap(fb_info.tga_fb_base, 0);
switch (fb_info.tga_type) {
#ifdef FBCON_HAS_CFB8
case 0: /* 8-plane */
Index: include/asm-alpha/pgtable.h
===================================================================
RCS file: /disk1/u4/cvs/linux/include/asm-alpha/pgtable.h,v
retrieving revision 1.38
diff -c -p -d -r1.38 pgtable.h
*** pgtable.h 1999/09/10 10:43:28 1.38
--- pgtable.h 1999/09/14 11:06:59
*************** extern inline pte_t mk_swap_pte(unsigned
*** 622,627 ****
#define kern_addr_valid(addr) (1)
#define io_remap_page_range(start, busaddr, size, prot) \
! remap_page_range(start, virt_to_phys(ioremap(busaddr)), size, prot)
#endif /* _ALPHA_PGTABLE_H */
--- 622,627 ----
#define kern_addr_valid(addr) (1)
#define io_remap_page_range(start, busaddr, size, prot) \
! remap_page_range(start, virt_to_phys(ioremap(busaddr, 0)), size, prot)
#endif /* _ALPHA_PGTABLE_H */
Index: include/asm-alpha/processor.h
===================================================================
RCS file: /disk1/u4/cvs/linux/include/asm-alpha/processor.h,v
retrieving revision 1.39
diff -c -p -d -r1.39 processor.h
*** processor.h 1999/08/06 01:45:53 1.39
--- processor.h 1999/09/14 11:06:59
*************** extern inline unsigned long thread_saved
*** 115,121 ****
extern void start_thread(struct pt_regs *, unsigned long, unsigned long);
/* Free all resources held by a thread. */
! extern void release_thread(struct task_struct *);
/* Create a kernel thread without removing it from tasklists. */
extern long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
--- 115,121 ----
extern void start_thread(struct pt_regs *, unsigned long, unsigned long);
/* Free all resources held by a thread. */
! #define release_thread(tsk) do { } while (0)
/* Create a kernel thread without removing it from tasklists. */
extern long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
Index: include/asm-alpha/unistd.h
===================================================================
RCS file: /disk1/u4/cvs/linux/include/asm-alpha/unistd.h,v
retrieving revision 1.36
diff -c -p -d -r1.36 unistd.h
*** unistd.h 1999/08/31 05:52:44 1.36
--- unistd.h 1999/09/14 11:06:59
***************
*** 310,315 ****
--- 310,316 ----
#define __NR_sendfile 370
#define __NR_setresgid 371
#define __NR_getresgid 372
+ #define __NR_dipc 373
#if defined(__LIBRARY__) && defined(__GNUC__)
Index: include/linux/pci.h
===================================================================
RCS file: /disk1/u4/cvs/linux/include/linux/pci.h,v
retrieving revision 1.119
diff -c -p -d -r1.119 pci.h
*** pci.h 1999/09/10 22:44:52 1.119
--- pci.h 1999/09/14 11:07:00
*************** int get_pci_list(char *buf);
*** 1524,1530 ****
int pci_proc_attach_device(struct pci_dev *dev);
int pci_proc_detach_device(struct pci_dev *dev);
void pci_name_device(struct pci_dev *dev);
! struct resource *pci_find_parent_resource(struct pci_dev *dev, struct resource *res);
struct pci_dev *pci_find_device (unsigned int vendor, unsigned int device, struct pci_dev *from);
struct pci_dev *pci_find_subsys (unsigned int vendor, unsigned int device,
--- 1524,1530 ----
int pci_proc_attach_device(struct pci_dev *dev);
int pci_proc_detach_device(struct pci_dev *dev);
void pci_name_device(struct pci_dev *dev);
! struct resource *pci_find_parent_resource(struct pci_dev *dev, struct resource *res, int check_contained);
struct pci_dev *pci_find_device (unsigned int vendor, unsigned int device, struct pci_dev *from);
struct pci_dev *pci_find_subsys (unsigned int vendor, unsigned int device,
-- To unsubscribe: send e-mail to axp-list-request@redhat.com with 'unsubscribe' as the subject. Do not send it to axp-list@redhat.com
This archive was generated by hypermail 2a22 : Mon Oct 04 1999 - 12:44:52 PDT