History

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.

Ingo Molnar committed 17 years ago

Commit 0ad5d702 parents 44347d9 1cb81b125 files · +1616 −565Browse files

Showing the changes to include/linux (3 of 25 files). Show all

Unified · Split

3 files
  1. include/linux/mm.h +4 −3
  2. include/linux/ptrace.h +0 −10
  3. include/linux/sched.h +4 −9
include/linux/mm.h+4−3
@@ -19,6 +19,7 @@ struct anon_vma; · 18 unmodified lines
19struct file_ra_state;19struct file_ra_state;
20struct user_struct;20struct user_struct;
21struct writeback_control;21struct writeback_control;
22struct 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 */
24extern unsigned long max_mapnr;25extern unsigned long max_mapnr;
@@ -1319,8 +1320,8 @@ int vmemmap_populate_basepages(struct page *start_page, · 1294 unmodified lines
1319int vmemmap_populate(struct page *start_page, unsigned long pages, int node);1320int vmemmap_populate(struct page *start_page, unsigned long pages, int node);
1320void vmemmap_populate_print_last(void);1321void vmemmap_populate_print_last(void);
1321 1322
1322extern void *alloc_locked_buffer(size_t size);1323extern int account_locked_memory(struct mm_struct *mm, struct rlimit *rlim,
1323extern void free_locked_buffer(void *buffer, size_t size);1324 size_t size);
1324extern void release_locked_buffer(void *buffer, size_t size);1325extern 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 */
include/linux/ptrace.h+0−10
@@ -95,7 +95,6 @@ extern void __ptrace_link(struct task_struct *child, · 94 unmodified lines
95 struct task_struct *new_parent);95 struct task_struct *new_parent);
96extern void __ptrace_unlink(struct task_struct *child);96extern void __ptrace_unlink(struct task_struct *child);
97extern void exit_ptrace(struct task_struct *tracer);97extern void exit_ptrace(struct task_struct *tracer);
98extern void ptrace_fork(struct task_struct *task, unsigned long clone_flags);
99#define PTRACE_MODE_READ 198#define PTRACE_MODE_READ 1
100#define PTRACE_MODE_ATTACH 299#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) · 225 unmodified lines
327#define arch_ptrace_untrace(task) do { } while (0)326#define arch_ptrace_untrace(task) do { } while (0)
328#endif327#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
339extern int task_current_syscall(struct task_struct *target, long *callno,329extern 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);
include/linux/sched.h+4−9
@@ -96,8 +96,8 @@ struct exec_domain; · 95 unmodified lines
96struct futex_pi_state;96struct futex_pi_state;
97struct robust_list_head;97struct robust_list_head;
98struct bio;98struct bio;
99struct bts_tracer;
100struct fs_struct;99struct fs_struct;
100struct 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 { · 1105 unmodified lines
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); · 776 unmodified lines
2003extern char *get_task_comm(char *to, struct task_struct *tsk);1996extern char *get_task_comm(char *to, struct task_struct *tsk);
2004 1997
2005#ifdef CONFIG_SMP1998#ifdef CONFIG_SMP
1999extern void wait_task_context_switch(struct task_struct *p);
2006extern unsigned long wait_task_inactive(struct task_struct *, long match_state);2000extern unsigned long wait_task_inactive(struct task_struct *, long match_state);
2007#else2001#else
2002static inline void wait_task_context_switch(struct task_struct *p) {}
2008static inline unsigned long wait_task_inactive(struct task_struct *p,2003static inline unsigned long wait_task_inactive(struct task_struct *p,
2009 long match_state)2004 long match_state)
2010{2005{

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t