Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192246
b: refs/heads/master
c: 3d0205b
h: refs/heads/master
v: v3
  • Loading branch information
John Stultz authored and Thomas Gleixner committed Mar 23, 2010
1 parent ffdc3fc commit e68d87c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e1292ba164742e3a236e407148e00300b7196906
refs/heads/master: 3d0205bd1383aa3cac93c209b7c7d03b27930195
4 changes: 0 additions & 4 deletions trunk/include/linux/timex.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ struct timex {
*/
extern unsigned long tick_usec; /* USER_HZ period (usec) */
extern unsigned long tick_nsec; /* ACTHZ period (nsec) */
extern int tickadj; /* amount of adjustment per tick */

/*
* phase-lock loop variables
Expand Down Expand Up @@ -270,9 +269,6 @@ extern void second_overflow(void);
extern void update_ntp_one_tick(void);
extern int do_adjtimex(struct timex *);

/* Don't use! Compatibility define for existing users. */
#define tickadj (500/HZ ? : 1)

int read_current_timer(unsigned long *timer_val);

/* The clock frequency of the i8253/i8254 PIT */
Expand Down

0 comments on commit e68d87c

Please sign in to comment.