The patch titled
remove the second arg of do_timer_interrupt()
has been added to the -mm tree. Its filename is
remove-the-second-arg-of-do_timer_interrupt.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
areca-raid-linux-scsi-driver.patch
drivers-net-ne3210c-cleanups.patch
arch-ppc-kernel-ppc_ksymsc-remove-unused-define-export_symtab_strops.patch
more-vr4181-removal.patch
arch-sh64-kconfig-doesnt-need-its-own-log_buf_shift.patch
i386-fix-incorrect-tss-entry-for-ldt.patch
arch-cris-kconfigdebug-use-lib-kconfigdebug.patch
use-select-in-sound-isa-kconfig-fix.patch
fs-jbd-cleanups.patch
remove-register_ioctl32_conversion-and-unregister_ioctl32_conversion.patch
schedule-obsolete-oss-drivers-for-removal-version-2.patch
fs-kconfig-quota-help-text-updates.patch
jffs-jffs2-remove-wrong-function-prototypes.patch
arm26-one-g-is-enough-for-everyone.patch
remove-the-second-arg-of-do_timer_interrupt.patch
introduce-and-use-kzalloc-make-kcalloc-a-static-inline.patch
dlm-recovery-make-code-static.patch
dlm-build-fix.patch
kgdb-ga.patch
kgdb-x86_64-support.patch
video_bt848-remove-not-required-part-of-the-help-text.patch
fs-asfs-make-code-static.patch
reiser4-kconfig-help-cleanup.patch
fuse-device-functions.patch
fix-unusual-placement-of-inline-keyword-in-hpet.patch
merge-some-from-rustys-trivial-patches.patch
include-asm-arm26-hardirqh-remove-define-irq_enter.patch
remove-sound-oss-skeletonc.patch
include-asm-i386-extern-inline-static-inline.patch
include-linux-blkdevh-extern-inline-static-inline.patch
extern-inline-static-inline.patch
include-linux-bioh-extern-inline-static-inline.patch
drivers-net-irda-irportc-cleanups.patch
drivers-net-arcnet-possible-cleanups.patch
drivers-net-sk98lin-possible-cleanups.patch
drivers-cdrom-fix-up-schedule_timeout-usage-fix.patch
mm-mmapnommuc-several-unexports.patch
unexport-hugetlb_total_pages.patch
unexport-clear_page_dirty_for_io.patch
mm-filemapc-make-sync_page_range_nolock-static.patch
mm-filemapc-make-generic_file_direct_io-static.patch
mm-page_allocc-unexport-nr_swap_pages.patch
unexport-console_unblank.patch
mm-swapc-unexport-vm_acct_memory.patch
mm-swapfilec-unexport-total_swap_pages.patch
mm-swap_statec-unexport-swapper_space.patch
unexport-idle_cpu.patch
unexport-uts_sem.patch
__deprecated_for_modules-insert_resource.patch
__deprecated_for_modules-panic_timeout.patch
sound-oss-sequencer_syms-unexport-reprogram_timer.patch
From: Adrian Bunk <[EMAIL PROTECTED]>
The second arg of do_timer_interrupt() is not used in the functions, and
all callers pass NULL.
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Cc: Paul Mundt <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/i386/kernel/time.c | 5 ++---
arch/sh/kernel/time.c | 4 ++--
arch/sh64/kernel/time.c | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff -puN arch/i386/kernel/time.c~remove-the-second-arg-of-do_timer_interrupt
arch/i386/kernel/time.c
--- devel/arch/i386/kernel/time.c~remove-the-second-arg-of-do_timer_interrupt
2005-08-21 21:57:57.000000000 -0700
+++ devel-akpm/arch/i386/kernel/time.c 2005-08-21 21:57:57.000000000 -0700
@@ -252,8 +252,7 @@ EXPORT_SYMBOL(profile_pc);
* timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick
*/
-static inline void do_timer_interrupt(int irq, void *dev_id,
- struct pt_regs *regs)
+static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
{
#ifdef CONFIG_X86_IO_APIC
if (timer_ack) {
@@ -307,7 +306,7 @@ irqreturn_t timer_interrupt(int irq, voi
cur_timer->mark_offset();
- do_timer_interrupt(irq, NULL, regs);
+ do_timer_interrupt(irq, regs);
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
diff -puN arch/sh64/kernel/time.c~remove-the-second-arg-of-do_timer_interrupt
arch/sh64/kernel/time.c
--- devel/arch/sh64/kernel/time.c~remove-the-second-arg-of-do_timer_interrupt
2005-08-21 21:57:57.000000000 -0700
+++ devel-akpm/arch/sh64/kernel/time.c 2005-08-21 21:57:57.000000000 -0700
@@ -303,7 +303,7 @@ static long last_rtc_update = 0;
* timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick
*/
-static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs
*regs)
+static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
{
unsigned long long current_ctc;
asm ("getcon cr62, %0" : "=r" (current_ctc));
@@ -361,7 +361,7 @@ static irqreturn_t timer_interrupt(int i
* locally disabled. -arca
*/
write_lock(&xtime_lock);
- do_timer_interrupt(irq, NULL, regs);
+ do_timer_interrupt(irq, regs);
write_unlock(&xtime_lock);
return IRQ_HANDLED;
diff -puN arch/sh/kernel/time.c~remove-the-second-arg-of-do_timer_interrupt
arch/sh/kernel/time.c
--- devel/arch/sh/kernel/time.c~remove-the-second-arg-of-do_timer_interrupt
2005-08-21 21:57:57.000000000 -0700
+++ devel-akpm/arch/sh/kernel/time.c 2005-08-21 21:57:57.000000000 -0700
@@ -234,7 +234,7 @@ static long last_rtc_update;
* timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick
*/
-static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs
*regs)
+static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
{
do_timer(regs);
#ifndef CONFIG_SMP
@@ -285,7 +285,7 @@ static irqreturn_t timer_interrupt(int i
* locally disabled. -arca
*/
write_seqlock(&xtime_lock);
- do_timer_interrupt(irq, NULL, regs);
+ do_timer_interrupt(irq, regs);
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
