Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 116971
b: refs/heads/master
c: 66f50ee
h: refs/heads/master
i:
  116969: 2b3a038
  116967: 4b0fb7d
v: v3
  • Loading branch information
Paul Mundt authored and Linus Torvalds committed Oct 23, 2008
1 parent f2e2a20 commit f63d959
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 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: 4c8210427bd1b7efa1dabf93f4d2312f29908d8f
refs/heads/master: 66f50ee3cee4c9d98eea0add6f439e6e5e0ca4a5
7 changes: 6 additions & 1 deletion trunk/include/linux/profile.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,16 @@ struct notifier_block;

#if defined(CONFIG_PROFILING) && defined(CONFIG_PROC_FS)
void create_prof_cpu_mask(struct proc_dir_entry *de);
int create_proc_profile(void);
#else
static inline void create_prof_cpu_mask(struct proc_dir_entry *de)
{
}

static inline int create_proc_profile(void)
{
return 0;
}
#endif

enum profile_type {
Expand All @@ -37,7 +43,6 @@ extern int prof_on __read_mostly;
/* init basic kernel profiler */
int profile_init(void);
int profile_setup(char *str);
int create_proc_profile(void);
void profile_tick(int type);

/*
Expand Down

0 comments on commit f63d959

Please sign in to comment.