The patch titled
uml: Remove unused variable
has been removed from the -mm tree. Its filename is
uml-remove-unused-variable.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: uml: Remove unused variable
From: Jeff Dike <jdike@xxxxxxxxxxx>
timer_irq_inited was useless, so it is removed.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/include/kern_util.h | 1 -
arch/um/kernel/time.c | 5 -----
arch/um/os-Linux/signal.c | 7 -------
3 files changed, 13 deletions(-)
diff -puN arch/um/include/kern_util.h~uml-remove-unused-variable arch/um/include/kern_util.h
--- a/arch/um/include/kern_util.h~uml-remove-unused-variable
+++ a/arch/um/include/kern_util.h
@@ -27,7 +27,6 @@ extern int ncpus;
extern char *linux_prog;
extern char *gdb_init;
extern int kmalloc_ok;
-extern int timer_irq_inited;
extern int jail;
extern int nsyscalls;
diff -puN arch/um/kernel/time.c~uml-remove-unused-variable arch/um/kernel/time.c
--- a/arch/um/kernel/time.c~uml-remove-unused-variable
+++ a/arch/um/kernel/time.c
@@ -35,9 +35,6 @@ unsigned long long sched_clock(void)
return (unsigned long long)jiffies_64 * (1000000000 / HZ);
}
-/* Changed at early boot */
-int timer_irq_inited = 0;
-
static unsigned long long prev_nsecs;
#ifdef CONFIG_UML_REAL_TIME_CLOCK
static long long delta; /* Deviation per interval */
@@ -116,8 +113,6 @@ static void register_timer(void)
printk(KERN_ERR "register_timer : request_irq failed - "
"errno = %d\n", -err);
- timer_irq_inited = 1;
-
err = set_interval(1);
if(err != 0)
printk(KERN_ERR "register_timer : set_interval failed - "
diff -puN arch/um/os-Linux/signal.c~uml-remove-unused-variable arch/um/os-Linux/signal.c
--- a/arch/um/os-Linux/signal.c~uml-remove-unused-variable
+++ a/arch/um/os-Linux/signal.c
@@ -55,15 +55,8 @@ void sig_handler(int sig, struct sigcont
set_signals(enabled);
}
-extern int timer_irq_inited;
-
static void real_alarm_handler(int sig, struct sigcontext *sc)
{
- if(!timer_irq_inited){
- signals_enabled = 1;
- return;
- }
-
if(sig == SIGALRM)
switch_timers(0);
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
uml-use-mcmodel=kernel-for-x86_64.patch
uml-fix-proc-vs-interrupt-context-spinlock-deadlock.patch
uml-const-more-data.patch
uml-get-rid-of-zone_dma-use.patch
uml-fix-missing-x86_64-register-definitions.patch
uml-fix-gcov-support.patch
uml-use-correct-sigbus-handler.patch
uml-add-checkstack-support.patch
uml-mark-some-tt-mode-code.patch
uml-thread-creation-tidying.patch
uml-file-renaming.patch
uml-add-an-export.patch
uml-fix-sleep-length-bug.patch
uml-fix-allocation-size.patch
uml-remove-pte_mkexec.patch
simplify-update_times-avoid-jiffies-jiffies_64-aliasing-problem-2.patch
kill-wall_jiffies.patch
const-struct-tty_operations.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
introduce-kernel_execve.patch
rename-the-provided-execve-functions-to-kernel_execve.patch
provide-kernel_execve-on-all-architectures.patch
provide-kernel_execve-on-all-architectures-fix.patch
remove-the-use-of-_syscallx-macros-in-uml.patch
sh64-remove-the-use-of-kernel-syscalls.patch
remove-remaining-errno-and-__kernel_syscalls__-references.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
