diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-25 15:06:03 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-25 15:06:03 -0500 |
| commit | d7c8f96f0d49eefe7526b3c1e3cb81c46c8c5658 (patch) | |
| tree | 5102f24bc845c7dd664751143b032288b22104a2 | |
| parent | d71ef3ab4cc7081ba7b013101fdbcabf7c96bf9d (diff) | |
| parent | 3092ad9622508428a20f1cd45ad3ac9f8fbf7cd4 (diff) | |
| download | rt-patches-d7c8f96f0d49eefe7526b3c1e3cb81c46c8c5658.tar.gz | |
Merge branch 'v2.6.33-rt'v2.6.33-999-g2b8c70bv2.6.33-635-g2594a57v2.6.33-632-gf24407dv2.6.33-626-g6544517v2.6.33-467-g64d497fv2.6.33-261-g37d4008v2.6.33-229-g68c6b85v2.6.33-1002-g4163095
Conflicts:
series
Just deleting staging-comedi-Fix-type-in-semaphore-conversion.patch
Nothing to see here.
| -rw-r--r-- | mutex-semaphore-cleanups-in-staging-dir.patch | 2 | ||||
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | staging-comedi-Fix-type-in-semaphore-conversion.patch | 29 |
3 files changed, 1 insertions, 31 deletions
diff --git a/mutex-semaphore-cleanups-in-staging-dir.patch b/mutex-semaphore-cleanups-in-staging-dir.patch index d3ba0e5..877d9ab 100644 --- a/mutex-semaphore-cleanups-in-staging-dir.patch +++ b/mutex-semaphore-cleanups-in-staging-dir.patch @@ -69,7 +69,7 @@ index 9a1b559..d611bd7 100644 "usbduxsub[%d] is ready to connect to comedi.\n", index); - init_MUTEX(&(usbduxsub[index].sem)); -+ sema_init(&(usbduxsub[index].sem)), 1; ++ sema_init(&(usbduxsub[index].sem), 1); /* save a pointer to the usb device */ usbduxsub[index].usbdev = udev; @@ -501,7 +501,6 @@ printk-Restore-irqs-before-calling-release_console_m.patch # v2.6.33.7.1-rt29.patch perf-Use-kmap_atomic_direct.patch perf-Provide-kmap_atomic_direct-for-CONFIG_HIGHMEM.patch -staging-comedi-Fix-type-in-semaphore-conversion.patch x86-Limit-32bit-PAE-memory-to-16G.patch tracing-Do-not-allow-llseek-to-set_ftrace_filter.patch rt-mm-fix-kthreadd-livelock-in-drain_local_pages_wor.patch diff --git a/staging-comedi-Fix-type-in-semaphore-conversion.patch b/staging-comedi-Fix-type-in-semaphore-conversion.patch deleted file mode 100644 index d237794..0000000 --- a/staging-comedi-Fix-type-in-semaphore-conversion.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 00b073df968c8ced3df1e43d4d04ae52af5ff999 Mon Sep 17 00:00:00 2001 -From: adi@drcomp.erfurt.thur.de <adi@drcomp.erfurt.thur.de> -Date: Thu, 16 Sep 2010 17:28:40 +0200 -Subject: [PATCH] staging/comedi: Fix type in semaphore conversion - -commit 00b073df968c8ced3df1e43d4d04ae52af5ff999 in tip. - -This patch corrects a typo in the RT patchset that prevents usbdux.c -from being built. - -Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de> -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> - -diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c -index d611bd7..b98e91c 100644 ---- a/drivers/staging/comedi/drivers/usbdux.c -+++ b/drivers/staging/comedi/drivers/usbdux.c -@@ -2370,7 +2370,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf, - dev_dbg(dev, "comedi_: usbdux: " - "usbduxsub[%d] is ready to connect to comedi.\n", index); - -- sema_init(&(usbduxsub[index].sem)), 1; -+ sema_init(&(usbduxsub[index].sem), 1); - /* save a pointer to the usb device */ - usbduxsub[index].usbdev = udev; - --- -1.7.1.1 - |