AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-03-05 05:27:50 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

cris: Don't use create_proc_read_entry()

Browse Source 
Don't use create_proc_read_entry() as that is deprecated, but rather use
proc_create_data() and seq_file instead.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
cc: Mikael Starvik <starvik@axis.com>
cc: linux-cris-kernel@axis.com
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
David Howells 2013-04-11 03:04:20 +01:00 committed by Al Viro
parent 210b834a96
commit 1eb5b23ae7
2 changed files with 259 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

293
arch/cris/arch-v10/kernel/fasttimer.c
View File

@ -25,6 +25,7 @@
#include <arch/svinto.h> #include <arch/svinto.h>
#include <asm/fasttimer.h> #include <asm/fasttimer.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h>
#define DEBUG_LOG_INCLUDED #define DEBUG_LOG_INCLUDED
@ -489,196 +490,162 @@ void schedule_usleep(unsigned long us)
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len
,int *eof, void *data_unused);
#endif /* CONFIG_PROC_FS */
#ifdef CONFIG_PROC_FS
/* This value is very much based on testing */ /* This value is very much based on testing */
#define BIG_BUF_SIZE (500 + NUM_TIMER_STATS * 300) #define BIG_BUF_SIZE (500 + NUM_TIMER_STATS * 300)
static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len static int proc_fasttimer_show(struct seq_file *m, void *v)
,int *eof, void *data_unused)
{ {
unsigned long flags; unsigned long flags;
int i = 0; int i = 0;
int num_to_show; int num_to_show;
struct fasttime_t tv; struct fasttime_t tv;
struct fast_timer *t, *nextt; struct fast_timer *t, *nextt;
static char *bigbuf = NULL;
static unsigned long used;
if (!bigbuf && !(bigbuf = vmalloc(BIG_BUF_SIZE))) do_gettimeofday_fast(&tv);
{
used = 0;
if (buf)
buf[0] = '\0';
return 0;
}
if (!offset || !used) seq_printf(m, "Fast timers added: %i\n", fast_timers_added);
{ seq_printf(m, "Fast timers started: %i\n", fast_timers_started);
do_gettimeofday_fast(&tv); seq_printf(m, "Fast timer interrupts: %i\n", fast_timer_ints);
seq_printf(m, "Fast timers expired: %i\n", fast_timers_expired);
used = 0; seq_printf(m, "Fast timers deleted: %i\n", fast_timers_deleted);
used += sprintf(bigbuf + used, "Fast timers added: %i\n", seq_printf(m, "Fast timer running: %s\n",
fast_timers_added); fast_timer_running ? "yes" : "no");
used += sprintf(bigbuf + used, "Fast timers started: %i\n", seq_printf(m, "Current time: %lu.%06lu\n",
fast_timers_started); (unsigned long)tv.tv_jiff,
used += sprintf(bigbuf + used, "Fast timer interrupts: %i\n", (unsigned long)tv.tv_usec);
fast_timer_ints);
used += sprintf(bigbuf + used, "Fast timers expired: %i\n",
fast_timers_expired);
used += sprintf(bigbuf + used, "Fast timers deleted: %i\n",
fast_timers_deleted);
used += sprintf(bigbuf + used, "Fast timer running: %s\n",
fast_timer_running ? "yes" : "no");
used += sprintf(bigbuf + used, "Current time: %lu.%06lu\n",
(unsigned long)tv.tv_jiff,
(unsigned long)tv.tv_usec);
#ifdef FAST_TIMER_SANITY_CHECKS #ifdef FAST_TIMER_SANITY_CHECKS
used += sprintf(bigbuf + used, "Sanity failed: %i\n", seq_printf(m, "Sanity failed: %i\n", sanity_failed);
sanity_failed);
#endif #endif
used += sprintf(bigbuf + used, "\n"); seq_putc(m, '\n');
#ifdef DEBUG_LOG_INCLUDED #ifdef DEBUG_LOG_INCLUDED
{ {
int end_i = debug_log_cnt; int end_i = debug_log_cnt;
i = 0; i = 0;
if (debug_log_cnt_wrapped) if (debug_log_cnt_wrapped)
{ i = debug_log_cnt;
i = debug_log_cnt;
}
while ((i != end_i || (debug_log_cnt_wrapped && !used)) && while (i != end_i || debug_log_cnt_wrapped) {
used+100 < BIG_BUF_SIZE) if (seq_printf(m, debug_log_string[i], debug_log_value[i]) < 0)
{ return 0;
used += sprintf(bigbuf + used, debug_log_string[i], i = (i+1) % DEBUG_LOG_MAX;
debug_log_value[i]); }
i = (i+1) % DEBUG_LOG_MAX; }
} seq_putc(m, '\n');
}
used += sprintf(bigbuf + used, "\n");
#endif #endif
num_to_show = (fast_timers_started < NUM_TIMER_STATS ? fast_timers_started: num_to_show = (fast_timers_started < NUM_TIMER_STATS ? fast_timers_started:
NUM_TIMER_STATS); NUM_TIMER_STATS);
used += sprintf(bigbuf + used, "Timers started: %i\n", fast_timers_started); seq_printf(m, "Timers started: %i\n", fast_timers_started);
for (i = 0; i < num_to_show && (used+100 < BIG_BUF_SIZE) ; i++) for (i = 0; i < num_to_show; i++) {
{ int cur = (fast_timers_started - i - 1) % NUM_TIMER_STATS;
int cur = (fast_timers_started - i - 1) % NUM_TIMER_STATS;
#if 1 //ndef FAST_TIMER_LOG #if 1 //ndef FAST_TIMER_LOG
used += sprintf(bigbuf + used, "div: %i freq: %i delay: %i" seq_printf(m, "div: %i freq: %i delay: %i"
"\n", "\n",
timer_div_settings[cur], timer_div_settings[cur],
timer_freq_settings[cur], timer_freq_settings[cur],
timer_delay_settings[cur] timer_delay_settings[cur]);
);
#endif #endif
#ifdef FAST_TIMER_LOG #ifdef FAST_TIMER_LOG
t = &timer_started_log[cur]; t = &timer_started_log[cur];
used += sprintf(bigbuf + used, "%-14s s: %6lu.%06lu e: %6lu.%06lu " if (seq_printf(m, "%-14s s: %6lu.%06lu e: %6lu.%06lu "
"d: %6li us data: 0x%08lX" "d: %6li us data: 0x%08lX"
"\n", "\n",
t->name, t->name,
(unsigned long)t->tv_set.tv_jiff, (unsigned long)t->tv_set.tv_jiff,
(unsigned long)t->tv_set.tv_usec, (unsigned long)t->tv_set.tv_usec,
(unsigned long)t->tv_expires.tv_jiff, (unsigned long)t->tv_expires.tv_jiff,
(unsigned long)t->tv_expires.tv_usec, (unsigned long)t->tv_expires.tv_usec,
t->delay_us, t->delay_us,
t->data t->data) < 0)
); return 0;
#endif #endif
} }
used += sprintf(bigbuf + used, "\n"); seq_putc(m, '\n');
#ifdef FAST_TIMER_LOG #ifdef FAST_TIMER_LOG
num_to_show = (fast_timers_added < NUM_TIMER_STATS ? fast_timers_added: num_to_show = (fast_timers_added < NUM_TIMER_STATS ? fast_timers_added:
NUM_TIMER_STATS); NUM_TIMER_STATS);
used += sprintf(bigbuf + used, "Timers added: %i\n", fast_timers_added); seq_printf(m, "Timers added: %i\n", fast_timers_added);
for (i = 0; i < num_to_show && (used+100 < BIG_BUF_SIZE); i++) for (i = 0; i < num_to_show; i++) {
{ t = &timer_added_log[(fast_timers_added - i - 1) % NUM_TIMER_STATS];
t = &timer_added_log[(fast_timers_added - i - 1) % NUM_TIMER_STATS]; if (seq_printf(m, "%-14s s: %6lu.%06lu e: %6lu.%06lu "
used += sprintf(bigbuf + used, "%-14s s: %6lu.%06lu e: %6lu.%06lu " "d: %6li us data: 0x%08lX"
"d: %6li us data: 0x%08lX" "\n",
"\n", t->name,
t->name, (unsigned long)t->tv_set.tv_jiff,
(unsigned long)t->tv_set.tv_jiff, (unsigned long)t->tv_set.tv_usec,
(unsigned long)t->tv_set.tv_usec, (unsigned long)t->tv_expires.tv_jiff,
(unsigned long)t->tv_expires.tv_jiff, (unsigned long)t->tv_expires.tv_usec,
(unsigned long)t->tv_expires.tv_usec, t->delay_us,
t->delay_us, t->data) < 0)
t->data return 0;
); }
} seq_putc(m, '\n');
used += sprintf(bigbuf + used, "\n");
num_to_show = (fast_timers_expired < NUM_TIMER_STATS ? fast_timers_expired: num_to_show = (fast_timers_expired < NUM_TIMER_STATS ? fast_timers_expired:
NUM_TIMER_STATS); NUM_TIMER_STATS);
used += sprintf(bigbuf + used, "Timers expired: %i\n", fast_timers_expired); seq_printf(m, "Timers expired: %i\n", fast_timers_expired);
for (i = 0; i < num_to_show && (used+100 < BIG_BUF_SIZE); i++) for (i = 0; i < num_to_show; i++) {
{ t = &timer_expired_log[(fast_timers_expired - i - 1) % NUM_TIMER_STATS];
t = &timer_expired_log[(fast_timers_expired - i - 1) % NUM_TIMER_STATS]; if (seq_printf(m, "%-14s s: %6lu.%06lu e: %6lu.%06lu "
used += sprintf(bigbuf + used, "%-14s s: %6lu.%06lu e: %6lu.%06lu " "d: %6li us data: 0x%08lX"
"d: %6li us data: 0x%08lX" "\n",
"\n", t->name,
t->name, (unsigned long)t->tv_set.tv_jiff,
(unsigned long)t->tv_set.tv_jiff, (unsigned long)t->tv_set.tv_usec,
(unsigned long)t->tv_set.tv_usec, (unsigned long)t->tv_expires.tv_jiff,
(unsigned long)t->tv_expires.tv_jiff, (unsigned long)t->tv_expires.tv_usec,
(unsigned long)t->tv_expires.tv_usec, t->delay_us,
t->delay_us, t->data) < 0)
t->data return 0;
); }
} seq_putc(m, '\n');
used += sprintf(bigbuf + used, "\n");
#endif #endif
used += sprintf(bigbuf + used, "Active timers:\n"); seq_puts(m, "Active timers:\n");
local_irq_save(flags);
t = fast_timer_list;
while (t != NULL && (used+100 < BIG_BUF_SIZE))
{
nextt = t->next;
local_irq_restore(flags);
used += sprintf(bigbuf + used, "%-14s s: %6lu.%06lu e: %6lu.%06lu "
"d: %6li us data: 0x%08lX"
/* " func: 0x%08lX" */
"\n",
t->name,
(unsigned long)t->tv_set.tv_jiff,
(unsigned long)t->tv_set.tv_usec,
(unsigned long)t->tv_expires.tv_jiff,
(unsigned long)t->tv_expires.tv_usec,
t->delay_us,
t->data
/* , t->function */
);
local_irq_save(flags); local_irq_save(flags);
if (t->next != nextt) t = fast_timer_list;
{ while (t) {
printk(KERN_WARNING "timer removed!\n"); nextt = t->next;
} local_irq_restore(flags);
t = nextt; if (seq_printf(m, "%-14s s: %6lu.%06lu e: %6lu.%06lu "
} "d: %6li us data: 0x%08lX"
local_irq_restore(flags); /* " func: 0x%08lX" */
} "\n",
t->name,
(unsigned long)t->tv_set.tv_jiff,
(unsigned long)t->tv_set.tv_usec,
(unsigned long)t->tv_expires.tv_jiff,
(unsigned long)t->tv_expires.tv_usec,
t->delay_us,
t->data
/* , t->function */
) < 0)
return 0;
local_irq_save(flags);
if (t->next != nextt)
printk(KERN_WARNING "timer removed!\n");
t = nextt;
}
local_irq_restore(flags);
if (used - offset < len) return 0;
{
len = used - offset;
}
memcpy(buf, bigbuf + offset, len);
*start = buf;
*eof = 1;
return len;
} }
static int proc_fasttimer_open(struct inode *inode, struct file *file)
{
return single_open_size(file, proc_fasttimer_show, PDE_DATA(inode), BIG_BUF_SIZE);
}
static const struct file_operations proc_fasttimer_fops = {
.open = proc_fasttimer_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
#endif /* PROC_FS */ #endif /* PROC_FS */
#ifdef FAST_TIMER_TEST #ifdef FAST_TIMER_TEST
@ -856,7 +823,7 @@ int fast_timer_init(void)
} }
#endif #endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
create_proc_read_entry("fasttimer", 0, NULL, proc_fasttimer_read, NULL); proc_create("fasttimer", 0, NULL, &proc_fasttimer_fops);
#endif /* PROC_FS */ #endif /* PROC_FS */
if(request_irq(TIMER1_IRQ_NBR, timer1_handler, 0, if(request_irq(TIMER1_IRQ_NBR, timer1_handler, 0,
"fast timer int", NULL)) "fast timer int", NULL))

290
arch/cris/arch-v32/kernel/fasttimer.c
View File

@ -23,6 +23,7 @@
#include <hwregs/timer_defs.h> #include <hwregs/timer_defs.h>
#include <asm/fasttimer.h> #include <asm/fasttimer.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h>
/* /*
* timer0 is running at 100MHz and generating jiffies timer ticks * timer0 is running at 100MHz and generating jiffies timer ticks
@ -463,194 +464,161 @@ void schedule_usleep(unsigned long us)
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len
,int *eof, void *data_unused);
#endif /* CONFIG_PROC_FS */
#ifdef CONFIG_PROC_FS
/* This value is very much based on testing */ /* This value is very much based on testing */
#define BIG_BUF_SIZE (500 + NUM_TIMER_STATS * 300) #define BIG_BUF_SIZE (500 + NUM_TIMER_STATS * 300)
static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len static int proc_fasttimer_show(struct seq_file *m, void *v)
,int *eof, void *data_unused)
{ {
unsigned long flags; unsigned long flags;
int i = 0; int i = 0;
int num_to_show; int num_to_show;
struct fasttime_t tv; struct fasttime_t tv;
struct fast_timer *t, *nextt; struct fast_timer *t, *nextt;
static char *bigbuf = NULL;
static unsigned long used;
if (!bigbuf) { do_gettimeofday_fast(&tv);
bigbuf = vmalloc(BIG_BUF_SIZE);
if (!bigbuf) {
used = 0;
if (buf)
buf[0] = '\0';
return 0;
}
}
if (!offset || !used) { seq_printf(m, "Fast timers added: %i\n", fast_timers_added);
do_gettimeofday_fast(&tv); seq_printf(m, "Fast timers started: %i\n", fast_timers_started);
seq_printf(m, "Fast timer interrupts: %i\n", fast_timer_ints);
used = 0; seq_printf(m, "Fast timers expired: %i\n", fast_timers_expired);
used += sprintf(bigbuf + used, "Fast timers added: %i\n", seq_printf(m, "Fast timers deleted: %i\n", fast_timers_deleted);
fast_timers_added); seq_printf(m, "Fast timer running: %s\n",
used += sprintf(bigbuf + used, "Fast timers started: %i\n", fast_timer_running ? "yes" : "no");
fast_timers_started); seq_printf(m, "Current time: %lu.%06lu\n",
used += sprintf(bigbuf + used, "Fast timer interrupts: %i\n", (unsigned long)tv.tv_jiff,
fast_timer_ints); (unsigned long)tv.tv_usec);
used += sprintf(bigbuf + used, "Fast timers expired: %i\n",
fast_timers_expired);
used += sprintf(bigbuf + used, "Fast timers deleted: %i\n",
fast_timers_deleted);
used += sprintf(bigbuf + used, "Fast timer running: %s\n",
fast_timer_running ? "yes" : "no");
used += sprintf(bigbuf + used, "Current time: %lu.%06lu\n",
(unsigned long)tv.tv_jiff,
(unsigned long)tv.tv_usec);
#ifdef FAST_TIMER_SANITY_CHECKS #ifdef FAST_TIMER_SANITY_CHECKS
used += sprintf(bigbuf + used, "Sanity failed: %i\n", seq_printf(m, "Sanity failed: %i\n", sanity_failed);
sanity_failed);
#endif #endif
used += sprintf(bigbuf + used, "\n"); seq_putc(m, '\n');
#ifdef DEBUG_LOG_INCLUDED #ifdef DEBUG_LOG_INCLUDED
{ {
int end_i = debug_log_cnt; int end_i = debug_log_cnt;
i = 0; i = 0;
if (debug_log_cnt_wrapped) if (debug_log_cnt_wrapped)
i = debug_log_cnt; i = debug_log_cnt;
while ((i != end_i || (debug_log_cnt_wrapped && !used)) && while ((i != end_i || debug_log_cnt_wrapped)) {
used+100 < BIG_BUF_SIZE) if (seq_printf(m, debug_log_string[i], debug_log_value[i]) < 0)
{ return 0;
used += sprintf(bigbuf + used, debug_log_string[i], i = (i+1) % DEBUG_LOG_MAX;
debug_log_value[i]); }
i = (i+1) % DEBUG_LOG_MAX; }
} seq_putc(m, '\n');
}
used += sprintf(bigbuf + used, "\n");
#endif #endif
num_to_show = (fast_timers_started < NUM_TIMER_STATS ? fast_timers_started: num_to_show = (fast_timers_started < NUM_TIMER_STATS ? fast_timers_started:
NUM_TIMER_STATS); NUM_TIMER_STATS);
used += sprintf(bigbuf + used, "Timers started: %i\n", fast_timers_started); seq_printf(m, "Timers started: %i\n", fast_timers_started);
for (i = 0; i < num_to_show && (used+100 < BIG_BUF_SIZE) ; i++) for (i = 0; i < num_to_show; i++) {
{ int cur = (fast_timers_started - i - 1) % NUM_TIMER_STATS;
int cur = (fast_timers_started - i - 1) % NUM_TIMER_STATS;
#if 1 //ndef FAST_TIMER_LOG #if 1 //ndef FAST_TIMER_LOG
used += sprintf(bigbuf + used, "div: %i delay: %i" seq_printf(m, "div: %i delay: %i"
"\n", "\n",
timer_div_settings[cur], timer_div_settings[cur],
timer_delay_settings[cur] timer_delay_settings[cur]);
);
#endif #endif
#ifdef FAST_TIMER_LOG #ifdef FAST_TIMER_LOG
t = &timer_started_log[cur]; t = &timer_started_log[cur];
used += sprintf(bigbuf + used, "%-14s s: %6lu.%06lu e: %6lu.%06lu " if (seq_printf(m, "%-14s s: %6lu.%06lu e: %6lu.%06lu "
"d: %6li us data: 0x%08lX" "d: %6li us data: 0x%08lX"
"\n", "\n",
t->name, t->name,
(unsigned long)t->tv_set.tv_jiff, (unsigned long)t->tv_set.tv_jiff,
(unsigned long)t->tv_set.tv_usec, (unsigned long)t->tv_set.tv_usec,
(unsigned long)t->tv_expires.tv_jiff, (unsigned long)t->tv_expires.tv_jiff,
(unsigned long)t->tv_expires.tv_usec, (unsigned long)t->tv_expires.tv_usec,
t->delay_us, t->delay_us,
t->data t->data) < 0)
); return 0;
#endif #endif
} }
used += sprintf(bigbuf + used, "\n"); seq_putc(m, '\n');
#ifdef FAST_TIMER_LOG #ifdef FAST_TIMER_LOG
num_to_show = (fast_timers_added < NUM_TIMER_STATS ? fast_timers_added: num_to_show = (fast_timers_added < NUM_TIMER_STATS ? fast_timers_added:
NUM_TIMER_STATS); NUM_TIMER_STATS);
used += sprintf(bigbuf + used, "Timers added: %i\n", fast_timers_added); seq_printf(m, "Timers added: %i\n", fast_timers_added);
for (i = 0; i < num_to_show && (used+100 < BIG_BUF_SIZE); i++) for (i = 0; i < num_to_show; i++) {
{ t = &timer_added_log[(fast_timers_added - i - 1) % NUM_TIMER_STATS];
t = &timer_added_log[(fast_timers_added - i - 1) % NUM_TIMER_STATS]; if (seq_printf(m, "%-14s s: %6lu.%06lu e: %6lu.%06lu "
used += sprintf(bigbuf + used, "%-14s s: %6lu.%06lu e: %6lu.%06lu " "d: %6li us data: 0x%08lX"
"d: %6li us data: 0x%08lX" "\n",
"\n", t->name,
t->name, (unsigned long)t->tv_set.tv_jiff,
(unsigned long)t->tv_set.tv_jiff, (unsigned long)t->tv_set.tv_usec,
(unsigned long)t->tv_set.tv_usec, (unsigned long)t->tv_expires.tv_jiff,
(unsigned long)t->tv_expires.tv_jiff, (unsigned long)t->tv_expires.tv_usec,
(unsigned long)t->tv_expires.tv_usec, t->delay_us,
t->delay_us, t->data) < 0)
t->data return 0;
); }
} seq_putc(m, '\n');
used += sprintf(bigbuf + used, "\n");
num_to_show = (fast_timers_expired < NUM_TIMER_STATS ? fast_timers_expired: num_to_show = (fast_timers_expired < NUM_TIMER_STATS ? fast_timers_expired:
NUM_TIMER_STATS); NUM_TIMER_STATS);
used += sprintf(bigbuf + used, "Timers expired: %i\n", fast_timers_expired); seq_printf(m, "Timers expired: %i\n", fast_timers_expired);
for (i = 0; i < num_to_show && (used+100 < BIG_BUF_SIZE); i++) for (i = 0; i < num_to_show; i++){
{ t = &timer_expired_log[(fast_timers_expired - i - 1) % NUM_TIMER_STATS];
t = &timer_expired_log[(fast_timers_expired - i - 1) % NUM_TIMER_STATS]; if (seq_printf(m, "%-14s s: %6lu.%06lu e: %6lu.%06lu "
used += sprintf(bigbuf + used, "%-14s s: %6lu.%06lu e: %6lu.%06lu " "d: %6li us data: 0x%08lX"
"d: %6li us data: 0x%08lX" "\n",
"\n", t->name,
t->name, (unsigned long)t->tv_set.tv_jiff,
(unsigned long)t->tv_set.tv_jiff, (unsigned long)t->tv_set.tv_usec,
(unsigned long)t->tv_set.tv_usec, (unsigned long)t->tv_expires.tv_jiff,
(unsigned long)t->tv_expires.tv_jiff, (unsigned long)t->tv_expires.tv_usec,
(unsigned long)t->tv_expires.tv_usec, t->delay_us,
t->delay_us, t->data) < 0)
t->data return 0;
); }
} seq_putc(m, '\n');
used += sprintf(bigbuf + used, "\n");
#endif #endif
used += sprintf(bigbuf + used, "Active timers:\n"); seq_puts(m, "Active timers:\n");
local_irq_save(flags); local_irq_save(flags);
t = fast_timer_list; t = fast_timer_list;
while (t != NULL && (used+100 < BIG_BUF_SIZE)) while (t != NULL){
{ nextt = t->next;
nextt = t->next; local_irq_restore(flags);
local_irq_restore(flags); if (seq_printf(m, "%-14s s: %6lu.%06lu e: %6lu.%06lu "
used += sprintf(bigbuf + used, "%-14s s: %6lu.%06lu e: %6lu.%06lu " "d: %6li us data: 0x%08lX"
"d: %6li us data: 0x%08lX"
/* " func: 0x%08lX" */ /* " func: 0x%08lX" */
"\n", "\n",
t->name, t->name,
(unsigned long)t->tv_set.tv_jiff, (unsigned long)t->tv_set.tv_jiff,
(unsigned long)t->tv_set.tv_usec, (unsigned long)t->tv_set.tv_usec,
(unsigned long)t->tv_expires.tv_jiff, (unsigned long)t->tv_expires.tv_jiff,
(unsigned long)t->tv_expires.tv_usec, (unsigned long)t->tv_expires.tv_usec,
t->delay_us, t->delay_us,
t->data t->data
/* , t->function */ /* , t->function */
); ) < 0)
local_irq_save(flags); return 0;
if (t->next != nextt) local_irq_save(flags);
{ if (t->next != nextt)
printk("timer removed!\n"); printk("timer removed!\n");
} t = nextt;
t = nextt; }
} local_irq_restore(flags);
local_irq_restore(flags); return 0;
}
if (used - offset < len)
{
len = used - offset;
}
memcpy(buf, bigbuf + offset, len);
*start = buf;
*eof = 1;
return len;
} }
static int proc_fasttimer_open(struct inode *inode, struct file *file)
{
return single_open_size(file, proc_fasttimer_show, PDE_DATA(inode), BIG_BUF_SIZE);
}
static const struct file_operations proc_fasttimer_fops = {
.open = proc_fasttimer_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
#endif /* PROC_FS */ #endif /* PROC_FS */
#ifdef FAST_TIMER_TEST #ifdef FAST_TIMER_TEST
@ -815,7 +783,7 @@ int fast_timer_init(void)
printk("fast_timer_init()\n"); printk("fast_timer_init()\n");
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
create_proc_read_entry("fasttimer", 0, NULL, proc_fasttimer_read, NULL); proc_create("fasttimer", 0, NULL, &proc_fasttimer_fops);
#endif /* PROC_FS */ #endif /* PROC_FS */
if (request_irq(TIMER0_INTR_VECT, timer_trig_interrupt, if (request_irq(TIMER0_INTR_VECT, timer_trig_interrupt,
IRQF_SHARED | IRQF_DISABLED, IRQF_SHARED | IRQF_DISABLED,