Loading 01-Revert-Bluetooth-Add-missing-QUIRK_NO_RESET-test-to-.patch 0 → 100644 +28 −0 Original line number Diff line number Diff line From ed58a8145f228127f7dc54b74ee10aab0a4c8590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@seblu.net> Date: Tue, 1 May 2012 13:35:12 +0200 Subject: [PATCH] Revert "Bluetooth: Add missing QUIRK_NO_RESET test to hci_dev_do_close" This reverts commit ca0d6c7ece0e78268cd7c5c378d6b1b610625085. --- net/bluetooth/hci_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 5aeb624..9de9371 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -640,8 +640,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) /* Reset device */ skb_queue_purge(&hdev->cmd_q); atomic_set(&hdev->cmd_cnt, 1); - if (!test_bit(HCI_RAW, &hdev->flags) && - test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) { + if (!test_bit(HCI_RAW, &hdev->flags)) { set_bit(HCI_INIT, &hdev->flags); __hci_request(hdev, hci_reset_req, 0, msecs_to_jiffies(250)); -- 1.7.10 02-change-default-console-loglevel.patch 0 → 100644 +12 −0 Original line number Diff line number Diff line diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c --- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300 +++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300 @@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ +#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ DECLARE_WAIT_QUEUE_HEAD(log_wait); PKGBUILD +31 −11 Original line number Diff line number Diff line Loading @@ -3,22 +3,41 @@ shopt -s nullglob kernelver=3.3.3 kernelver=3.3.4 kernelsuf=-seblu pkgname=linux$kernelsuf-$kernelver pkgver=1 pkgname=linux pkgver=2 pkgrel=1 [[ ${kernelver##*rc} != $kernelver ]] && testing='testing' arch=('x86_64') license=('GPL2') url='http://www.kernel.org' options=('!strip') makedepends=('xmlto' 'docbook-xsl') source=( "http://www.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernelver.tar.xz" 'config.x86_64' 'config.i686' '0001-Revert-Bluetooth-Add-missing-QUIRK_NO_RESET-test-to-.patch' '02-change-default-console-loglevel.patch' ) # here we have a linus rc kernel if [[ $kernelver =~ -rc ]]; then kernelbase=${kernelver%-rc*} kernelbase=${kernelbase%%.*}.$((${kernelbase##*.} - 1)) source+=("http://www.kernel.org/pub/linux/kernel/v3.0/testing/patch-$kernelver.xz") # here we have stable kernel schema elif [[ $kernelver =~ [[:digit:]]\.[[:digit:]]\.[[:digit:]] ]]; then kernelbase=${kernelver%.*} (( ${kernelver##*.} != 0 )) && source+=("http://www.kernel.org/pub/linux/kernel/v3.0/patch-$kernelver.xz") # here we have a linus kernel else kernelbase=$kernelver kernelver=$kernelver.0 fi source+=("http://www.kernel.org/pub/linux/kernel/v3.0/linux-$kernelbase.tar.xz") # we can now compute real package name. Useful to avoid overwrite pkgname=$pkgname$kernelsuf-$kernelver # small hack to avoid makepkg to check checksum SKIPCHECKSUMS=1 Loading @@ -26,12 +45,13 @@ build() { msg2 "Kernel version: $kernelver" msg2 "Kernel suffix: $kernelsuf" cd linux-$kernelver cd linux-$kernelbase if (( NOEXTRACT == 0 )); then # patching sources for _f in "$srcdir"/*.patch; do msg2 " Applying patch ${_f##*/}" # merging patches for _f in "$srcdir/patch-$kernelver" "$srcdir"/*.patch; do [[ -r "$_f" ]] || continue msg2 " Applying patch: ${_f##*/}" patch -N -p1 -i "$_f" done Loading Loading @@ -64,7 +84,7 @@ build() { } package() { cd linux-$kernelver cd linux-$kernelbase # get real compiled kernel version compver=$(make kernelrelease) pkgdesc="The Linux Kernel, version $compver" Loading Loading @@ -133,7 +153,7 @@ EOF copy_headers() { install -d "$pkgdir/lib/modules/$compver" ln -sf ../../../usr/src/linux-$compver "$pkgdir/lib/modules/$compver/build" cd "$srcdir/linux-$kernelver" cd "$srcdir/linux-$kernelbase" install -D -m644 Makefile "$pkgdir/usr/src/linux-$compver/Makefile" install -D -m644 kernel/Makefile "$pkgdir/usr/src/linux-$compver/kernel/Makefile" install -D -m644 .config "$pkgdir/usr/src/linux-$compver/.config" Loading install +1 −1 Original line number Diff line number Diff line # arg 1: the new package version # arg 2: the old package version pkgname='linux-seblu-3.3.3' pkgname='linux-seblu-3.3.4' post_install () { source /usr/share/$pkgname/info Loading Loading
01-Revert-Bluetooth-Add-missing-QUIRK_NO_RESET-test-to-.patch 0 → 100644 +28 −0 Original line number Diff line number Diff line From ed58a8145f228127f7dc54b74ee10aab0a4c8590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu@seblu.net> Date: Tue, 1 May 2012 13:35:12 +0200 Subject: [PATCH] Revert "Bluetooth: Add missing QUIRK_NO_RESET test to hci_dev_do_close" This reverts commit ca0d6c7ece0e78268cd7c5c378d6b1b610625085. --- net/bluetooth/hci_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 5aeb624..9de9371 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -640,8 +640,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) /* Reset device */ skb_queue_purge(&hdev->cmd_q); atomic_set(&hdev->cmd_cnt, 1); - if (!test_bit(HCI_RAW, &hdev->flags) && - test_bit(HCI_QUIRK_NO_RESET, &hdev->quirks)) { + if (!test_bit(HCI_RAW, &hdev->flags)) { set_bit(HCI_INIT, &hdev->flags); __hci_request(hdev, hci_reset_req, 0, msecs_to_jiffies(250)); -- 1.7.10
02-change-default-console-loglevel.patch 0 → 100644 +12 −0 Original line number Diff line number Diff line diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c --- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300 +++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300 @@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea /* We show everything that is MORE important than this.. */ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ -#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ +#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ DECLARE_WAIT_QUEUE_HEAD(log_wait);
PKGBUILD +31 −11 Original line number Diff line number Diff line Loading @@ -3,22 +3,41 @@ shopt -s nullglob kernelver=3.3.3 kernelver=3.3.4 kernelsuf=-seblu pkgname=linux$kernelsuf-$kernelver pkgver=1 pkgname=linux pkgver=2 pkgrel=1 [[ ${kernelver##*rc} != $kernelver ]] && testing='testing' arch=('x86_64') license=('GPL2') url='http://www.kernel.org' options=('!strip') makedepends=('xmlto' 'docbook-xsl') source=( "http://www.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernelver.tar.xz" 'config.x86_64' 'config.i686' '0001-Revert-Bluetooth-Add-missing-QUIRK_NO_RESET-test-to-.patch' '02-change-default-console-loglevel.patch' ) # here we have a linus rc kernel if [[ $kernelver =~ -rc ]]; then kernelbase=${kernelver%-rc*} kernelbase=${kernelbase%%.*}.$((${kernelbase##*.} - 1)) source+=("http://www.kernel.org/pub/linux/kernel/v3.0/testing/patch-$kernelver.xz") # here we have stable kernel schema elif [[ $kernelver =~ [[:digit:]]\.[[:digit:]]\.[[:digit:]] ]]; then kernelbase=${kernelver%.*} (( ${kernelver##*.} != 0 )) && source+=("http://www.kernel.org/pub/linux/kernel/v3.0/patch-$kernelver.xz") # here we have a linus kernel else kernelbase=$kernelver kernelver=$kernelver.0 fi source+=("http://www.kernel.org/pub/linux/kernel/v3.0/linux-$kernelbase.tar.xz") # we can now compute real package name. Useful to avoid overwrite pkgname=$pkgname$kernelsuf-$kernelver # small hack to avoid makepkg to check checksum SKIPCHECKSUMS=1 Loading @@ -26,12 +45,13 @@ build() { msg2 "Kernel version: $kernelver" msg2 "Kernel suffix: $kernelsuf" cd linux-$kernelver cd linux-$kernelbase if (( NOEXTRACT == 0 )); then # patching sources for _f in "$srcdir"/*.patch; do msg2 " Applying patch ${_f##*/}" # merging patches for _f in "$srcdir/patch-$kernelver" "$srcdir"/*.patch; do [[ -r "$_f" ]] || continue msg2 " Applying patch: ${_f##*/}" patch -N -p1 -i "$_f" done Loading Loading @@ -64,7 +84,7 @@ build() { } package() { cd linux-$kernelver cd linux-$kernelbase # get real compiled kernel version compver=$(make kernelrelease) pkgdesc="The Linux Kernel, version $compver" Loading Loading @@ -133,7 +153,7 @@ EOF copy_headers() { install -d "$pkgdir/lib/modules/$compver" ln -sf ../../../usr/src/linux-$compver "$pkgdir/lib/modules/$compver/build" cd "$srcdir/linux-$kernelver" cd "$srcdir/linux-$kernelbase" install -D -m644 Makefile "$pkgdir/usr/src/linux-$compver/Makefile" install -D -m644 kernel/Makefile "$pkgdir/usr/src/linux-$compver/kernel/Makefile" install -D -m644 .config "$pkgdir/usr/src/linux-$compver/.config" Loading
install +1 −1 Original line number Diff line number Diff line # arg 1: the new package version # arg 2: the old package version pkgname='linux-seblu-3.3.3' pkgname='linux-seblu-3.3.4' post_install () { source /usr/share/$pkgname/info Loading