dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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 <jdike@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike 2007-10-16 01:27:21 -07:00 committed by Linus Torvalds
parent 088bec4141
commit 532d0fa4d1
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/include/common-offsets.h
View File

@ -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);

1
arch/um/include/kern_util.h
View File

@ -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);

5
arch/um/kernel/time.c
View File

@ -11,11 +11,6 @@
#include "kern_util.h"
#include "os.h"
int hz(void)
{
return HZ;
}
/*
* Scheduler clock - returns current time in nanosec units.
*/

5
arch/um/os-Linux/skas/process.c
View File

@ -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, "

7
arch/um/os-Linux/time.c
View File

@ -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) {