Still present in latest ipipe - it's really the time to remove them. :->
Jan
---
arch/i386/kernel/io_apic.c | 1 +
arch/i386/kernel/process.c | 2 +-
arch/i386/kernel/traps.c | 2 +-
arch/i386/mach-generic/bigsmp.c | 1 -
arch/i386/mach-generic/default.c | 1 -
arch/i386/mach-generic/es7000.c | 1 -
arch/i386/mach-generic/summit.c | 1 -
arch/i386/mach-visws/visws_apic.c | 1 +
include/linux/smp.h | 2 --
9 files changed, 4 insertions(+), 8 deletions(-)
Index: linux-2.6.22-ipipe/arch/i386/kernel/io_apic.c
===================================================================
--- linux-2.6.22-ipipe.orig/arch/i386/kernel/io_apic.c
+++ linux-2.6.22-ipipe/arch/i386/kernel/io_apic.c
@@ -2044,6 +2044,7 @@ static struct irq_chip ioapic_chip __rea
.retrigger = ioapic_retrigger_irq,
};
+
static inline void init_IO_APIC_traps(void)
{
int irq;
Index: linux-2.6.22-ipipe/arch/i386/mach-generic/bigsmp.c
===================================================================
--- linux-2.6.22-ipipe.orig/arch/i386/mach-generic/bigsmp.c
+++ linux-2.6.22-ipipe/arch/i386/mach-generic/bigsmp.c
@@ -14,7 +14,6 @@
#include <linux/smp.h>
#include <linux/init.h>
#include <linux/dmi.h>
-#include <linux/ipipe.h>
#include <asm/mach-bigsmp/mach_apic.h>
#include <asm/mach-bigsmp/mach_apicdef.h>
#include <asm/mach-bigsmp/mach_ipi.h>
Index: linux-2.6.22-ipipe/arch/i386/mach-generic/default.c
===================================================================
--- linux-2.6.22-ipipe.orig/arch/i386/mach-generic/default.c
+++ linux-2.6.22-ipipe/arch/i386/mach-generic/default.c
@@ -13,7 +13,6 @@
#include <linux/string.h>
#include <linux/smp.h>
#include <linux/init.h>
-#include <linux/ipipe.h>
#include <asm/mach-default/mach_apic.h>
#include <asm/mach-default/mach_ipi.h>
#include <asm/mach-default/mach_mpparse.h>
Index: linux-2.6.22-ipipe/arch/i386/mach-generic/es7000.c
===================================================================
--- linux-2.6.22-ipipe.orig/arch/i386/mach-generic/es7000.c
+++ linux-2.6.22-ipipe/arch/i386/mach-generic/es7000.c
@@ -13,7 +13,6 @@
#include <linux/string.h>
#include <linux/smp.h>
#include <linux/init.h>
-#include <linux/ipipe.h>
#include <asm/mach-es7000/mach_apicdef.h>
#include <asm/mach-es7000/mach_apic.h>
#include <asm/mach-es7000/mach_ipi.h>
Index: linux-2.6.22-ipipe/arch/i386/mach-generic/summit.c
===================================================================
--- linux-2.6.22-ipipe.orig/arch/i386/mach-generic/summit.c
+++ linux-2.6.22-ipipe/arch/i386/mach-generic/summit.c
@@ -13,7 +13,6 @@
#include <linux/string.h>
#include <linux/smp.h>
#include <linux/init.h>
-#include <linux/ipipe.h>
#include <asm/mach-summit/mach_apic.h>
#include <asm/mach-summit/mach_apicdef.h>
#include <asm/mach-summit/mach_ipi.h>
Index: linux-2.6.22-ipipe/arch/i386/mach-visws/visws_apic.c
===================================================================
--- linux-2.6.22-ipipe.orig/arch/i386/mach-visws/visws_apic.c
+++ linux-2.6.22-ipipe/arch/i386/mach-visws/visws_apic.c
@@ -131,6 +131,7 @@ static struct irq_chip cobalt_irq_type =
.end = end_cobalt_irq,
};
+
/*
* This is the PIIX4-based 8259 that is wired up indirectly to Cobalt
* -- not the manner expected by the code in i8259.c.
Index: linux-2.6.22-ipipe/include/linux/smp.h
===================================================================
--- linux-2.6.22-ipipe.orig/include/linux/smp.h
+++ linux-2.6.22-ipipe/include/linux/smp.h
@@ -107,8 +107,6 @@ static inline int smp_call_function_sing
#endif /* !SMP */
-#include <linux/ipipe_base.h>
-
/*
* smp_processor_id(): get the current CPU ID.
*
Index: linux-2.6.22-ipipe/arch/i386/kernel/traps.c
===================================================================
--- linux-2.6.22-ipipe.orig/arch/i386/kernel/traps.c
+++ linux-2.6.22-ipipe/arch/i386/kernel/traps.c
@@ -759,7 +759,7 @@ static __kprobes void default_do_nmi(str
fastcall __kprobes void do_nmi(struct pt_regs * regs, long error_code)
{
- int cpu, cs;
+ int cpu, cs;
nmi_enter();
Index: linux-2.6.22-ipipe/arch/i386/kernel/process.c
===================================================================
--- linux-2.6.22-ipipe.orig/arch/i386/kernel/process.c
+++ linux-2.6.22-ipipe/arch/i386/kernel/process.c
@@ -644,7 +644,7 @@ struct task_struct fastcall * __switch_t
{
struct thread_struct *prev = &prev_p->thread,
*next = &next_p->thread;
- int cpu = raw_smp_processor_id();
+ int cpu = smp_processor_id();
struct tss_struct *tss = &per_cpu(init_tss, cpu);
/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Adeos-main mailing list [email protected] https://mail.gna.org/listinfo/adeos-main
