Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=532d0fa4d104ca3e37dd38bc5073376fcc3c2712
Commit:     532d0fa4d104ca3e37dd38bc5073376fcc3c2712
Parent:     088bec4141ceb663eecdd961292d110db891db73
Author:     Jeff Dike <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 01:27:21 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 09:43:08 2007 -0700

    uml: eliminate hz()
    
    Eliminate hz() since its only purpose was to provide a kernel-space constant
    to userspace code.  This can be done instead by providing the constant
    directly through kernel_constants.h.
    
    Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
    Cc: Thomas Gleixner <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/um/include/common-offsets.h |    2 ++
 arch/um/include/kern_util.h      |    1 -
 arch/um/kernel/time.c            |    5 -----
 arch/um/os-Linux/skas/process.c  |    5 +++--
 arch/um/os-Linux/time.c          |    7 +++----
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/arch/um/include/common-offsets.h b/arch/um/include/common-offsets.h
index 439b91f..5469469 100644
--- a/arch/um/include/common-offsets.h
+++ b/arch/um/include/common-offsets.h
@@ -32,3 +32,5 @@ DEFINE(UM_GFP_ATOMIC, GFP_ATOMIC);
 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
 
 DEFINE(UM_THREAD_SIZE, THREAD_SIZE);
+
+DEFINE(UM_HZ, HZ);
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
index 7e7e84e..74ce8e5 100644
--- a/arch/um/include/kern_util.h
+++ b/arch/um/include/kern_util.h
@@ -64,7 +64,6 @@ extern void paging_init(void);
 extern void init_flush_vm(void);
 extern void *syscall_sp(void *t);
 extern void syscall_trace(struct uml_pt_regs *regs, int entryexit);
-extern int hz(void);
 extern unsigned int do_IRQ(int irq, struct uml_pt_regs *regs);
 extern void interrupt_end(void);
 extern void initial_thread_cb(void (*proc)(void *), void *arg);
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 4fc8c25..633b673 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -11,11 +11,6 @@
 #include "kern_util.h"
 #include "os.h"
 
-int hz(void)
-{
-       return HZ;
-}
-
 /*
  * Scheduler clock - returns current time in nanosec units.
  */
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index 47efe90..5462469 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -392,8 +392,9 @@ int copy_context_skas0(unsigned long new_stack, int pid)
        *data = ((struct stub_data) { .offset   = MMAP_OFFSET(new_offset),
                                      .fd       = new_fd,
                                      .timer    = ((struct itimerval)
-                                                   { { 0, 1000000 / hz() },
-                                                     { 0, 1000000 / hz() }})});
+                                                   { { 0, 1000000 / UM_HZ },
+                                                     { 0, 1000000 / UM_HZ }})
+                                });
        err = ptrace_setregs(pid, thread_regs);
        if (err < 0)
                panic("copy_context_skas0 : PTRACE_SETREGS failed, "
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index f22fcdf..5939653 100644
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -8,14 +8,13 @@
 #include <signal.h>
 #include <time.h>
 #include <sys/time.h>
-#include "kern_util.h"
 #include "kern_constants.h"
 #include "os.h"
 #include "user.h"
 
 int set_interval(int is_virtual)
 {
-       int usec = 1000000/hz();
+       int usec = 1000000/UM_HZ;
        int timer_type = is_virtual ? ITIMER_VIRTUAL : ITIMER_REAL;
        struct itimerval interval = ((struct itimerval) { { 0, usec },
                                                          { 0, usec } });
@@ -43,8 +42,8 @@ void disable_timer(void)
 void switch_timers(int to_real)
 {
        struct itimerval disable = ((struct itimerval) { { 0, 0 }, { 0, 0 }});
-       struct itimerval enable = ((struct itimerval) { { 0, 1000000/hz() },
-                                                       { 0, 1000000/hz() }});
+       struct itimerval enable = ((struct itimerval) { { 0, 1000000/UM_HZ },
+                                                       { 0, 1000000/UM_HZ }});
        int old, new;
 
        if (to_real) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to