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
1919 struct file_ra_state;
2020 struct user_struct;
2121 struct writeback_control;
22+struct rlimit;
2223
2324 #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */
2425 extern unsigned long max_mapnr;
@@ -1319,8 +1320,8 @@ int vmemmap_populate_basepages(struct page *start_page, · 1294 unmodified lines
13191320 int vmemmap_populate(struct page *start_page, unsigned long pages, int node);
13201321 void vmemmap_populate_print_last(void);
13211322
1322−extern void *alloc_locked_buffer(size_t size);
1323−extern void free_locked_buffer(void *buffer, size_t size);
1324−extern void release_locked_buffer(void *buffer, size_t size);
1323+extern int account_locked_memory(struct mm_struct *mm, struct rlimit *rlim,
1324+ size_t size);
1325+extern void refund_locked_memory(struct mm_struct *mm, size_t size);
13251326 #endif /* __KERNEL__ */
13261327 #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
9595 struct task_struct *new_parent);
9696 extern void __ptrace_unlink(struct task_struct *child);
9797 extern void exit_ptrace(struct task_struct *tracer);
98−extern void ptrace_fork(struct task_struct *task, unsigned long clone_flags);
9998 #define PTRACE_MODE_READ 1
10099 #define PTRACE_MODE_ATTACH 2
101100 /* 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
327326 #define arch_ptrace_untrace(task) do { } while (0)
328327 #endif
329328
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−
339329 extern int task_current_syscall(struct task_struct *target, long *callno,
340330 unsigned long args[6], unsigned int maxargs,
341331 unsigned long *sp, unsigned long *pc);
include/linux/sched.h+4−9
@@ -96,8 +96,8 @@ struct exec_domain; · 95 unmodified lines
9696 struct futex_pi_state;
9797 struct robust_list_head;
9898 struct bio;
99−struct bts_tracer;
10099 struct fs_struct;
100+struct bts_context;
101101
102102 /*
103103 * List of flags we want to share for kernel threads,
@@ -1209,18 +1209,11 @@ struct task_struct { · 1105 unmodified lines
12091209 struct list_head ptraced;
12101210 struct list_head ptrace_entry;
12111211
1212−#ifdef CONFIG_X86_PTRACE_BTS
12131212 /*
12141213 * This is the tracer handle for the ptrace BTS extension.
12151214 * This field actually belongs to the ptracer task.
12161215 */
1217− struct bts_tracer *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 */
1216+ struct bts_context *bts;
12241217
12251218 /* PID/PID hash table linkage. */
12261219 struct pid_link pids[PIDTYPE_MAX];
@@ -2003,8 +1996,10 @@ extern void set_task_comm(struct task_struct *tsk, char *from); · 776 unmodified lines
20031996 extern char *get_task_comm(char *to, struct task_struct *tsk);
20041997
20051998 #ifdef CONFIG_SMP
1999+extern void wait_task_context_switch(struct task_struct *p);
20062000 extern unsigned long wait_task_inactive(struct task_struct *, long match_state);
20072001 #else
2002+static inline void wait_task_context_switch(struct task_struct *p) {}
20082003 static inline unsigned long wait_task_inactive(struct task_struct *p,
20092004 long match_state)
20102005 {

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