diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:38:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:39:00 -0400 |
| commit | 8dd8997d2c56c9f248294805e129e1fc69444380 (patch) | |
| tree | 3b030a04295fc031db98746c4074c2df1ed6a19f /scripts/rt-tester/t3-l1-pi-1rt.tst | |
| parent | 1eda75c131ea42ec173323b6c34aeed78ae637c1 (diff) | |
| parent | 016aa2ed1cc9cf704cf76d8df07751b6daa9750f (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'scripts/rt-tester/t3-l1-pi-1rt.tst')
| -rw-r--r-- | scripts/rt-tester/t3-l1-pi-1rt.tst | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/rt-tester/t3-l1-pi-1rt.tst b/scripts/rt-tester/t3-l1-pi-1rt.tst index 63440ca2cce9..8e6c8b11ae56 100644 --- a/scripts/rt-tester/t3-l1-pi-1rt.tst +++ b/scripts/rt-tester/t3-l1-pi-1rt.tst | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | # lockintnowait lock nr (0-7) | 19 | # lockintnowait lock nr (0-7) |
| 20 | # lockcont lock nr (0-7) | 20 | # lockcont lock nr (0-7) |
| 21 | # unlock lock nr (0-7) | 21 | # unlock lock nr (0-7) |
| 22 | # lockbkl lock nr (0-7) | ||
| 23 | # unlockbkl lock nr (0-7) | ||
| 24 | # signal thread to signal (0-7) | 22 | # signal thread to signal (0-7) |
| 25 | # reset 0 | 23 | # reset 0 |
| 26 | # resetevent 0 | 24 | # resetevent 0 |
| @@ -39,9 +37,6 @@ | |||
| 39 | # blocked lock nr (0-7) | 37 | # blocked lock nr (0-7) |
| 40 | # blockedwake lock nr (0-7) | 38 | # blockedwake lock nr (0-7) |
| 41 | # unlocked lock nr (0-7) | 39 | # unlocked lock nr (0-7) |
| 42 | # lockedbkl dont care | ||
| 43 | # blockedbkl dont care | ||
| 44 | # unlockedbkl dont care | ||
| 45 | # opcodeeq command opcode or number | 40 | # opcodeeq command opcode or number |
| 46 | # opcodelt number | 41 | # opcodelt number |
| 47 | # opcodegt number | 42 | # opcodegt number |