aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-04-05 12:56:54 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-05 12:56:54 -0700
commit6d64277bec57d213d20598a944d0d81e858a158f (patch)
tree33b443eb0774eae3ecce6e58fa134e505755c23e
parentb23f3d15544e5554c771e84b682097bc80307547 (diff)
downloadpatches-6d64277bec57d213d20598a944d0d81e858a158f.tar.gz
move drm poulsbo patches to pending
-rw-r--r--driver-core/warn-when-statically-allocated-kobjects-are-used.patch4
-rw-r--r--pending/drm-add-a-tracker-for-global-objects.patch (renamed from staging/drm-add-a-tracker-for-global-objects.patch)0
-rw-r--r--pending/drm-add-unlocked-ioctl-functionality-from-the-drm-repo.patch (renamed from staging/drm-add-unlocked-ioctl-functionality-from-the-drm-repo.patch)0
-rw-r--r--pending/drm-export-hash-table-functionality.patch (renamed from staging/drm-export-hash-table-functionality.patch)0
-rw-r--r--pending/drm-split-out-the-mm-declarations-in-a-separate-header.-add-atomic-operations.patch (renamed from staging/drm-split-out-the-mm-declarations-in-a-separate-header.-add-atomic-operations.patch)0
-rw-r--r--pending/staging-add-intel-poulsbo-morrestown-drm-driver.patch (renamed from staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch)0
6 files changed, 2 insertions, 2 deletions
diff --git a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch
index 2a700631cb3089..44869e2cf28453 100644
--- a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch
+++ b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch
@@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
void setup_arch(char **);
--- a/init/main.c
+++ b/init/main.c
-@@ -789,6 +789,14 @@ static void run_init_process(char *init_
+@@ -792,6 +792,14 @@ static void run_init_process(char *init_
kernel_execve(init_filename, argv_init, envp_init);
}
@@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* This is a non __init function. Force it to be noinline otherwise gcc
* makes it inline to init() and it becomes part of init.text section
*/
-@@ -798,6 +806,7 @@ static noinline int init_post(void)
+@@ -801,6 +809,7 @@ static noinline int init_post(void)
/* need to finish all async __init code before freeing the memory */
async_synchronize_full();
free_initmem();
diff --git a/staging/drm-add-a-tracker-for-global-objects.patch b/pending/drm-add-a-tracker-for-global-objects.patch
index 428ac7167e6f48..428ac7167e6f48 100644
--- a/staging/drm-add-a-tracker-for-global-objects.patch
+++ b/pending/drm-add-a-tracker-for-global-objects.patch
diff --git a/staging/drm-add-unlocked-ioctl-functionality-from-the-drm-repo.patch b/pending/drm-add-unlocked-ioctl-functionality-from-the-drm-repo.patch
index 217a97442bfd3a..217a97442bfd3a 100644
--- a/staging/drm-add-unlocked-ioctl-functionality-from-the-drm-repo.patch
+++ b/pending/drm-add-unlocked-ioctl-functionality-from-the-drm-repo.patch
diff --git a/staging/drm-export-hash-table-functionality.patch b/pending/drm-export-hash-table-functionality.patch
index 7e3f632b19aecb..7e3f632b19aecb 100644
--- a/staging/drm-export-hash-table-functionality.patch
+++ b/pending/drm-export-hash-table-functionality.patch
diff --git a/staging/drm-split-out-the-mm-declarations-in-a-separate-header.-add-atomic-operations.patch b/pending/drm-split-out-the-mm-declarations-in-a-separate-header.-add-atomic-operations.patch
index 69bd24dc81d546..69bd24dc81d546 100644
--- a/staging/drm-split-out-the-mm-declarations-in-a-separate-header.-add-atomic-operations.patch
+++ b/pending/drm-split-out-the-mm-declarations-in-a-separate-header.-add-atomic-operations.patch
diff --git a/staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch b/pending/staging-add-intel-poulsbo-morrestown-drm-driver.patch
index 7e076db5caea84..7e076db5caea84 100644
--- a/staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch
+++ b/pending/staging-add-intel-poulsbo-morrestown-drm-driver.patch