diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:18:34 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 07:36:22 -0400 |
commit | 0ad5d703c6c0fcd385d956555460df95dff7eb7e (patch) | |
tree | 4b777100f9be4fe90ca4bd043b9f98df672b5b3b /include/linux | |
parent | 44347d947f628060b92449702071bfe1d31dfb75 (diff) | |
parent | 1cb81b143fa8f0e4629f10690862e2e52ca792ff (diff) |
Merge branch 'tracing/hw-branch-tracing' into tracing/core
Merge reason: this topic is ready for upstream now. It passed
Oleg's review and Andrew had no further mm/*
objections/observations either.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mm.h | 7 | ||||
-rw-r--r-- | include/linux/ptrace.h | 10 | ||||
-rw-r--r-- | include/linux/sched.h | 13 |
3 files changed, 8 insertions, 22 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index bff1f0d475c7..009eabd3c21c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -19,6 +19,7 @@ struct anon_vma; | |||
19 | struct file_ra_state; | 19 | struct file_ra_state; |
20 | struct user_struct; | 20 | struct user_struct; |
21 | struct writeback_control; | 21 | struct writeback_control; |
22 | struct rlimit; | ||
22 | 23 | ||
23 | #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */ | 24 | #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */ |
24 | extern unsigned long max_mapnr; | 25 | extern unsigned long max_mapnr; |
@@ -1319,8 +1320,8 @@ int vmemmap_populate_basepages(struct page *start_page, | |||
1319 | int vmemmap_populate(struct page *start_page, unsigned long pages, int node); | 1320 | int vmemmap_populate(struct page *start_page, unsigned long pages, int node); |
1320 | void vmemmap_populate_print_last(void); | 1321 | void vmemmap_populate_print_last(void); |
1321 | 1322 | ||
1322 | extern void *alloc_locked_buffer(size_t size); | 1323 | extern int account_locked_memory(struct mm_struct *mm, struct rlimit *rlim, |
1323 | extern void free_locked_buffer(void *buffer, size_t size); | 1324 | size_t size); |
1324 | extern void release_locked_buffer(void *buffer, size_t size); | 1325 | extern void refund_locked_memory(struct mm_struct *mm, size_t size); |
1325 | #endif /* __KERNEL__ */ | 1326 | #endif /* __KERNEL__ */ |
1326 | #endif /* _LINUX_MM_H */ | 1327 | #endif /* _LINUX_MM_H */ |
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 67c15653fc23..59e133d39d50 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h | |||
@@ -95,7 +95,6 @@ extern void __ptrace_link(struct task_struct *child, | |||
95 | struct task_struct *new_parent); | 95 | struct task_struct *new_parent); |
96 | extern void __ptrace_unlink(struct task_struct *child); | 96 | extern void __ptrace_unlink(struct task_struct *child); |
97 | extern void exit_ptrace(struct task_struct *tracer); | 97 | extern void exit_ptrace(struct task_struct *tracer); |
98 | extern void ptrace_fork(struct task_struct *task, unsigned long clone_flags); | ||
99 | #define PTRACE_MODE_READ 1 | 98 | #define PTRACE_MODE_READ 1 |
100 | #define PTRACE_MODE_ATTACH 2 | 99 | #define PTRACE_MODE_ATTACH 2 |
101 | /* Returns 0 on success, -errno on denial. */ | 100 | /* Returns 0 on success, -errno on denial. */ |
@@ -327,15 +326,6 @@ static inline void user_enable_block_step(struct task_struct *task) | |||
327 | #define arch_ptrace_untrace(task) do { } while (0) | 326 | #define arch_ptrace_untrace(task) do { } while (0) |
328 | #endif | 327 | #endif |
329 | 328 | ||
330 | #ifndef arch_ptrace_fork | ||
331 | /* | ||
332 | * Do machine-specific work to initialize a new task. | ||
333 | * | ||
334 | * This is called from copy_process(). | ||
335 | */ | ||
336 | #define arch_ptrace_fork(child, clone_flags) do { } while (0) | ||
337 | #endif | ||
338 | |||
339 | extern int task_current_syscall(struct task_struct *target, long *callno, | 329 | extern int task_current_syscall(struct task_struct *target, long *callno, |
340 | unsigned long args[6], unsigned int maxargs, | 330 | unsigned long args[6], unsigned int maxargs, |
341 | unsigned long *sp, unsigned long *pc); | 331 | unsigned long *sp, unsigned long *pc); |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 7ede5e490913..1ed4ef520680 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -96,8 +96,8 @@ struct exec_domain; | |||
96 | struct futex_pi_state; | 96 | struct futex_pi_state; |
97 | struct robust_list_head; | 97 | struct robust_list_head; |
98 | struct bio; | 98 | struct bio; |
99 | struct bts_tracer; | ||
100 | struct fs_struct; | 99 | struct fs_struct; |
100 | struct bts_context; | ||
101 | 101 | ||
102 | /* | 102 | /* |
103 | * List of flags we want to share for kernel threads, | 103 | * List of flags we want to share for kernel threads, |
@@ -1209,18 +1209,11 @@ struct task_struct { | |||
1209 | struct list_head ptraced; | 1209 | struct list_head ptraced; |
1210 | struct list_head ptrace_entry; | 1210 | struct list_head ptrace_entry; |
1211 | 1211 | ||
1212 | #ifdef CONFIG_X86_PTRACE_BTS | ||
1213 | /* | 1212 | /* |
1214 | * This is the tracer handle for the ptrace BTS extension. | 1213 | * This is the tracer handle for the ptrace BTS extension. |
1215 | * This field actually belongs to the ptracer task. | 1214 | * This field actually belongs to the ptracer task. |
1216 | */ | 1215 | */ |
1217 | struct bts_tracer *bts; | 1216 | struct bts_context *bts; |
1218 | /* | ||
1219 | * The buffer to hold the BTS data. | ||
1220 | */ | ||
1221 | void *bts_buffer; | ||
1222 | size_t bts_size; | ||
1223 | #endif /* CONFIG_X86_PTRACE_BTS */ | ||
1224 | 1217 | ||
1225 | /* PID/PID hash table linkage. */ | 1218 | /* PID/PID hash table linkage. */ |
1226 | struct pid_link pids[PIDTYPE_MAX]; | 1219 | struct pid_link pids[PIDTYPE_MAX]; |
@@ -2003,8 +1996,10 @@ extern void set_task_comm(struct task_struct *tsk, char *from); | |||
2003 | extern char *get_task_comm(char *to, struct task_struct *tsk); | 1996 | extern char *get_task_comm(char *to, struct task_struct *tsk); |
2004 | 1997 | ||
2005 | #ifdef CONFIG_SMP | 1998 | #ifdef CONFIG_SMP |
1999 | extern void wait_task_context_switch(struct task_struct *p); | ||
2006 | extern unsigned long wait_task_inactive(struct task_struct *, long match_state); | 2000 | extern unsigned long wait_task_inactive(struct task_struct *, long match_state); |
2007 | #else | 2001 | #else |
2002 | static inline void wait_task_context_switch(struct task_struct *p) {} | ||
2008 | static inline unsigned long wait_task_inactive(struct task_struct *p, | 2003 | static inline unsigned long wait_task_inactive(struct task_struct *p, |
2009 | long match_state) | 2004 | long match_state) |
2010 | { | 2005 | { |