| From 96743b8f470d4301c29b5aa7ceec7b68732b4fb9 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Mon, 17 Jan 2011 19:44:50 -0500 |
| Subject: [PATCH] sched.h: delete extraneous junk |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/linux/sched.h b/include/linux/sched.h |
| index e10621e..ae05c57 100644 |
| --- a/include/linux/sched.h |
| +++ b/include/linux/sched.h |
| @@ -246,28 +246,12 @@ extern char ___assert_task_state[1 - 2*!!( |
| #define set_task_state(tsk, state_value) \ |
| set_mb((tsk)->state, (state_value)) |
| |
| -// #define PREEMPT_DIRECT |
| - |
| #ifdef CONFIG_X86_LOCAL_APIC |
| extern void nmi_show_all_regs(void); |
| #else |
| # define nmi_show_all_regs() do { } while (0) |
| #endif |
| |
| -#include <linux/smp.h> |
| -#include <linux/sem.h> |
| -#include <linux/signal.h> |
| -#include <linux/securebits.h> |
| -#include <linux/fs_struct.h> |
| -#include <linux/compiler.h> |
| -#include <linux/completion.h> |
| -#include <linux/pid.h> |
| -#include <linux/percpu.h> |
| -#include <linux/topology.h> |
| -#include <linux/seccomp.h> |
| - |
| -struct exec_domain; |
| - |
| /* |
| * set_current_state() includes a barrier so that the write of current->state |
| * is correctly serialised wrt the caller's subsequent test of whether to |
| -- |
| 1.7.1.1 |
| |