From: Jan Kiszka <jan.kiszka@domain.hid>
To: Philippe Gerum <rpm@xenomai.org>
Cc: adeos-main <adeos-main@gna.org>
Subject: [Adeos-main] [Resent][PATCH] noarch/i386: Remove useless patch hunks
Date: Sat, 15 Sep 2007 09:19:56 +0200 [thread overview]
Message-ID: <46EB879C.2050503@domain.hid> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 81 bytes --]
Still present in latest ipipe - it's really the time to remove them. :->
Jan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: ipipe-janitorial.patch --]
[-- Type: text/x-patch; name="ipipe-janitorial.patch", Size: 4737 bytes --]
---
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 */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]
next reply other threads:[~2007-09-15 7:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-15 7:19 Jan Kiszka [this message]
2007-10-04 8:02 ` [Adeos-main] [Resent][PATCH] noarch/i386: Remove useless patch hunks Philippe Gerum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46EB879C.2050503@domain.hid \
--to=jan.kiszka@domain.hid \
--cc=adeos-main@gna.org \
--cc=rpm@xenomai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.