From: tip-bot for Arnd Bergmann <arnd@arndb.de> To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, arnd@arndb.de, hpa@zytor.com, mingo@redhat.com, akpm@linux-foundation.org, arjan@linux.intel.com, tglx@linutronix.de Subject: [tip:irq/core] rtmutex: tester: Remove BKL tests Date: Tue, 22 Feb 2011 20:57:54 GMT [thread overview] Message-ID: <tip-fbabf8ca140fff2ddf60c23397d5892201e08095@git.kernel.org> (raw) In-Reply-To: <1295993854-4971-19-git-send-email-arnd@arndb.de> Commit-ID: fbabf8ca140fff2ddf60c23397d5892201e08095 Gitweb: http://git.kernel.org/tip/fbabf8ca140fff2ddf60c23397d5892201e08095 Author: Arnd Bergmann <arnd@arndb.de> AuthorDate: Tue, 25 Jan 2011 23:17:32 +0100 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Tue, 22 Feb 2011 21:45:55 +0100 rtmutex: tester: Remove BKL tests The BKL is going away, no need to test it any more. I left the definitions of the test case numbers in, so that the other tests do not get renumbered. [ tglx: renamed the place holder enum members ] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> LKML-Reference: <1295993854-4971-19-git-send-email-arnd@arndb.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/rtmutex-tester.c | 39 ++++----------------------------------- 1 files changed, 4 insertions(+), 35 deletions(-) diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c index 66cb89b..100e2f0 100644 --- a/kernel/rtmutex-tester.c +++ b/kernel/rtmutex-tester.c @@ -9,7 +9,6 @@ #include <linux/kthread.h> #include <linux/module.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/spinlock.h> #include <linux/sysdev.h> #include <linux/timer.h> @@ -27,7 +26,6 @@ struct test_thread_data { int opcode; int opdata; int mutexes[MAX_RT_TEST_MUTEXES]; - int bkl; int event; struct sys_device sysdev; }; @@ -46,8 +44,8 @@ enum test_opcodes { RTTEST_LOCKINTNOWAIT, /* 6 Lock interruptible no wait in wakeup, data = lockindex */ RTTEST_LOCKCONT, /* 7 Continue locking after the wakeup delay */ RTTEST_UNLOCK, /* 8 Unlock, data = lockindex */ - RTTEST_LOCKBKL, /* 9 Lock BKL */ - RTTEST_UNLOCKBKL, /* 10 Unlock BKL */ + RTTEST_WAS_LOCKBKL, /* 9 Was: Lock BKL */ + RTTEST_WAS_UNLOCKBKL, /* 10 Was: Unlock BKL */ RTTEST_SIGNAL, /* 11 Signal other test thread, data = thread id */ RTTEST_RESETEVENT = 98, /* 98 Reset event counter */ RTTEST_RESET = 99, /* 99 Reset all pending operations */ @@ -74,13 +72,6 @@ static int handle_op(struct test_thread_data *td, int lockwakeup) td->mutexes[i] = 0; } } - - if (!lockwakeup && td->bkl == 4) { -#ifdef CONFIG_LOCK_KERNEL - unlock_kernel(); -#endif - td->bkl = 0; - } return 0; case RTTEST_RESETEVENT: @@ -131,25 +122,6 @@ static int handle_op(struct test_thread_data *td, int lockwakeup) td->mutexes[id] = 0; return 0; - case RTTEST_LOCKBKL: - if (td->bkl) - return 0; - td->bkl = 1; -#ifdef CONFIG_LOCK_KERNEL - lock_kernel(); -#endif - td->bkl = 4; - return 0; - - case RTTEST_UNLOCKBKL: - if (td->bkl != 4) - break; -#ifdef CONFIG_LOCK_KERNEL - unlock_kernel(); -#endif - td->bkl = 0; - return 0; - default: break; } @@ -196,7 +168,6 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex) td->event = atomic_add_return(1, &rttest_event); break; - case RTTEST_LOCKBKL: default: break; } @@ -229,8 +200,6 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex) td->event = atomic_add_return(1, &rttest_event); return; - case RTTEST_LOCKBKL: - return; default: return; } @@ -380,11 +349,11 @@ static ssize_t sysfs_test_status(struct sys_device *dev, struct sysdev_attribute spin_lock(&rttest_lock); curr += sprintf(curr, - "O: %4d, E:%8d, S: 0x%08lx, P: %4d, N: %4d, B: %p, K: %d, M:", + "O: %4d, E:%8d, S: 0x%08lx, P: %4d, N: %4d, B: %p, M:", td->opcode, td->event, tsk->state, (MAX_RT_PRIO - 1) - tsk->prio, (MAX_RT_PRIO - 1) - tsk->normal_prio, - tsk->pi_blocked_on, td->bkl); + tsk->pi_blocked_on); for (i = MAX_RT_TEST_MUTEXES - 1; i >=0 ; i--) curr += sprintf(curr, "%d", td->mutexes[i]);
next prev parent reply other threads:[~2011-02-22 20:58 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-01-25 22:17 [RFC 00/20] Proposal for remaining BKL users Arnd Bergmann 2011-01-25 22:17 ` Arnd Bergmann 2011-01-25 22:17 ` [PATCH 01/20] drm/i810: remove the BKL Arnd Bergmann 2011-01-25 22:17 ` [PATCH 02/20] drm: remove i830 driver Arnd Bergmann 2011-01-25 22:17 ` [PATCH 03/20] staging/usbip: convert to kthread Arnd Bergmann 2011-01-28 17:53 ` Max Vozeler 2011-01-28 18:48 ` Arnd Bergmann 2011-03-01 22:15 ` Arnd Bergmann 2011-01-25 22:17 ` [PATCH 04/20] staging/cx25721: serialize access to devlist Arnd Bergmann 2011-01-26 16:23 ` Palash Bandyopadhyay 2011-01-31 21:37 ` Greg KH 2011-01-25 22:17 ` [PATCH 05/20] staging/go7007: remove the BKL Arnd Bergmann 2011-01-25 22:17 ` [PATCH 06/20] staging: Remove autofs3 Arnd Bergmann 2011-01-26 7:41 ` H. Peter Anvin 2011-01-25 22:17 ` [PATCH 07/20] staging: remove smbfs Arnd Bergmann 2011-01-25 22:17 ` [PATCH 08/20] adfs: remove the big kernel lock Arnd Bergmann 2011-01-25 22:20 ` Russell King 2011-01-25 22:17 ` [PATCH 09/20] hpfs: rename big kernel lock to hpfs_lock Arnd Bergmann 2011-01-25 22:17 ` [PATCH 10/20] hpfs: replace BKL with a global mutex Arnd Bergmann 2011-01-26 0:15 ` Andi Kleen 2011-01-26 0:19 ` Andi Kleen 2011-01-26 12:48 ` [PATCH v2] hpfs: remove the BKL Arnd Bergmann 2011-01-26 12:50 ` [PATCH 10/20] hpfs: replace BKL with a global mutex Arnd Bergmann 2011-01-26 16:52 ` Andi Kleen 2011-01-27 5:01 ` Nick Piggin 2011-01-27 10:57 ` Miklos Szeredi 2011-01-25 22:17 ` [PATCH 11/20] hpfs: move to drivers/staging Arnd Bergmann 2011-02-07 16:17 ` Mikulas Patocka 2011-02-07 19:31 ` Arnd Bergmann 2011-01-25 22:17 ` [PATCH 12/20] x25: remove the BKL Arnd Bergmann 2011-01-27 10:07 ` Andrew Hendry 2011-01-27 12:17 ` Arnd Bergmann 2011-01-27 12:38 ` [PATCH v2] " Arnd Bergmann 2011-01-27 13:20 ` Eric Dumazet 2011-01-27 13:43 ` Arnd Bergmann 2011-01-25 22:17 ` [PATCH 13/20] appletalk: move to staging Arnd Bergmann 2011-01-25 22:17 ` [PATCH 14/20] staging/appletalk: remove the BKL Arnd Bergmann 2011-01-25 22:29 ` David Miller 2011-01-26 12:57 ` Arnd Bergmann 2011-01-25 22:17 ` [PATCH 15/20] ufs: " Arnd Bergmann 2011-01-26 2:30 ` Nick Bowler 2011-01-26 12:53 ` Arnd Bergmann 2011-01-27 5:47 ` Nick Piggin 2011-01-27 13:13 ` Arnd Bergmann 2011-01-25 22:17 ` [PATCH 16/20] ipx: " Arnd Bergmann 2011-01-25 22:17 ` [PATCH 17/20] tracing: don't trace " Arnd Bergmann 2011-01-25 22:28 ` Frederic Weisbecker 2011-01-25 22:17 ` [PATCH 18/20] rtmutex-tester: remove BKL tests Arnd Bergmann 2011-01-26 15:00 ` [tip:core/locking] rtmutex-tester: Remove " tip-bot for Arnd Bergmann 2011-02-22 20:57 ` tip-bot for Arnd Bergmann [this message] 2011-01-25 22:17 ` [PATCH 19/20] drivers: remove extraneous includes of smp_lock.h Arnd Bergmann 2011-01-25 22:17 ` [PATCH 20/20] BKL: That's all, folks Arnd Bergmann 2011-01-26 6:19 ` Ingo Molnar 2011-01-26 8:47 ` Alan Cox 2011-01-26 11:01 ` Ingo Molnar 2011-01-26 11:22 ` Thomas Gleixner 2011-01-26 2:22 ` [RFC 00/20] Proposal for remaining BKL users Greg KH 2011-01-26 2:22 ` Greg KH 2011-01-26 11:31 ` Arnd Bergmann 2011-01-26 11:31 ` Arnd Bergmann 2011-01-26 11:58 ` Mauro Carvalho Chehab 2011-01-26 13:45 ` Arnd Bergmann 2011-01-26 13:45 ` Arnd Bergmann 2011-01-26 16:24 ` Palash Bandyopadhyay
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tip-fbabf8ca140fff2ddf60c23397d5892201e08095@git.kernel.org \ --to=arnd@arndb.de \ --cc=akpm@linux-foundation.org \ --cc=arjan@linux.intel.com \ --cc=hpa@zytor.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --subject='Re: [tip:irq/core] rtmutex: tester: Remove BKL tests' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.