Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2993
b: refs/heads/master
c: c5a3c2e
h: refs/heads/master
i:
  2991: 71f2994
v: v3
  • Loading branch information
Arnd Bergmann authored and Paul Mackerras committed Jun 22, 2005
1 parent e28485d commit 06ab7b8
Show file tree
Hide file tree
Showing 5 changed files with 507 additions and 472 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 773bf9c469c01f01280c9bd45ec2462dd94d08a0
refs/heads/master: c5a3c2e52af1bcb118022ffac9a0fd1d42d43bd3
3 changes: 2 additions & 1 deletion trunk/arch/ppc64/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@ obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o prom.o mpic.o

obj-$(CONFIG_PPC_PSERIES) += pSeries_pci.o pSeries_lpar.o pSeries_hvCall.o \
pSeries_nvram.o rtasd.o ras.o pSeries_reconfig.o \
xics.o rtas.o pSeries_setup.o pSeries_iommu.o
xics.o pSeries_setup.o pSeries_iommu.o

obj-$(CONFIG_EEH) += eeh.o
obj-$(CONFIG_PROC_FS) += proc_ppc64.o
obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o
obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o
obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
obj-$(CONFIG_SCANLOG) += scanlog.o
obj-$(CONFIG_VIOPATH) += viopath.o
Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/ppc64/kernel/mpic.h
Original file line number Diff line number Diff line change
Expand Up @@ -265,3 +265,6 @@ extern void mpic_send_ipi(unsigned int ipi_no, unsigned int cpu_mask);
extern int mpic_get_one_irq(struct mpic *mpic, struct pt_regs *regs);
/* This one gets to the primary mpic */
extern int mpic_get_irq(struct pt_regs *regs);

/* global mpic for pSeries */
extern struct mpic *pSeries_mpic;
Loading

0 comments on commit 06ab7b8

Please sign in to comment.