Merge reason: this topic is ready for upstream now. It passed Oleg's review and Andrew had no further mm/* objections/observations either.
Showing the changes to include/linux (3 of 25 files). Show all
Unified · Split
| @@ -19,6 +19,7 @@ struct anon_vma; · 18 unmodified lines | ||
| 19 | 19 | struct file_ra_state; |
| 20 | 20 | struct user_struct; |
| 21 | 21 | struct writeback_control; |
| 22 | +struct rlimit; | |
| 22 | 23 | |
| 23 | 24 | #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */ |
| 24 | 25 | extern unsigned long max_mapnr; |
| @@ -1319,8 +1320,8 @@ int vmemmap_populate_basepages(struct page *start_page, · 1294 unmodified lines | ||
| 1319 | 1320 | int vmemmap_populate(struct page *start_page, unsigned long pages, int node); |
| 1320 | 1321 | void vmemmap_populate_print_last(void); |
| 1321 | 1322 | |
| 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); | |
| 1325 | 1326 | #endif /* __KERNEL__ */ |
| 1326 | 1327 | #endif /* _LINUX_MM_H */ |
| @@ -95,7 +95,6 @@ extern void __ptrace_link(struct task_struct *child, · 94 unmodified lines | ||
| 95 | 95 | struct task_struct *new_parent); |
| 96 | 96 | extern void __ptrace_unlink(struct task_struct *child); |
| 97 | 97 | extern void exit_ptrace(struct task_struct *tracer); |
| 98 | −extern void ptrace_fork(struct task_struct *task, unsigned long clone_flags); | |
| 99 | 98 | #define PTRACE_MODE_READ 1 |
| 100 | 99 | #define PTRACE_MODE_ATTACH 2 |
| 101 | 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 | 326 | #define arch_ptrace_untrace(task) do { } while (0) |
| 328 | 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 | 329 | extern int task_current_syscall(struct task_struct *target, long *callno, |
| 340 | 330 | unsigned long args[6], unsigned int maxargs, |
| 341 | 331 | unsigned long *sp, unsigned long *pc); |
| @@ -96,8 +96,8 @@ struct exec_domain; · 95 unmodified lines | ||
| 96 | 96 | struct futex_pi_state; |
| 97 | 97 | struct robust_list_head; |
| 98 | 98 | struct bio; |
| 99 | −struct bts_tracer; | |
| 100 | 99 | struct fs_struct; |
| 100 | +struct bts_context; | |
| 101 | 101 | |
| 102 | 102 | /* |
| 103 | 103 | * List of flags we want to share for kernel threads, |
| @@ -1209,18 +1209,11 @@ struct task_struct { · 1105 unmodified lines | ||
| 1209 | 1209 | struct list_head ptraced; |
| 1210 | 1210 | struct list_head ptrace_entry; |
| 1211 | 1211 | |
| 1212 | −#ifdef CONFIG_X86_PTRACE_BTS | |
| 1213 | 1212 | /* |
| 1214 | 1213 | * This is the tracer handle for the ptrace BTS extension. |
| 1215 | 1214 | * This field actually belongs to the ptracer task. |
| 1216 | 1215 | */ |
| 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; | |
| 1224 | 1217 | |
| 1225 | 1218 | /* PID/PID hash table linkage. */ |
| 1226 | 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 | ||
| 2003 | 1996 | extern char *get_task_comm(char *to, struct task_struct *tsk); |
| 2004 | 1997 | |
| 2005 | 1998 | #ifdef CONFIG_SMP |
| 1999 | +extern void wait_task_context_switch(struct task_struct *p); | |
| 2006 | 2000 | extern unsigned long wait_task_inactive(struct task_struct *, long match_state); |
| 2007 | 2001 | #else |
| 2002 | +static inline void wait_task_context_switch(struct task_struct *p) {} | |
| 2008 | 2003 | static inline unsigned long wait_task_inactive(struct task_struct *p, |
| 2009 | 2004 | long match_state) |
| 2010 | 2005 | { |