diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-26 14:38:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-26 14:38:48 -0400 |
| commit | fc7b3ff1ac0ca3250628911ca6534882db9f2cb3 (patch) | |
| tree | 96972cb5ef0a54c5011b308497ee43de550c8b3d /arch/s390/mm/fault.c | |
| parent | 019793b7554b18818624e9cf7a2ee8ba8cf6bda0 (diff) | |
| parent | 9ff4cfb3fcfd48b49fdd9be7381b3be340853aa4 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] kvm-390: Let kernel exit SIE instruction on work
[S390] dasd: check sense type in device change handler
[S390] pfault: fix token handling
[S390] qdio: reset error states immediately
[S390] fix page table walk for changing page attributes
[S390] prng: prevent access beyond end of stack
[S390] dasd: fix race between open and offline
Diffstat (limited to 'arch/s390/mm/fault.c')
| -rw-r--r-- | arch/s390/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 9217e332b118..4cf85fef407c 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c | |||
| @@ -558,9 +558,9 @@ static void pfault_interrupt(unsigned int ext_int_code, | |||
| 558 | * Get the token (= address of the task structure of the affected task). | 558 | * Get the token (= address of the task structure of the affected task). |
| 559 | */ | 559 | */ |
| 560 | #ifdef CONFIG_64BIT | 560 | #ifdef CONFIG_64BIT |
| 561 | tsk = *(struct task_struct **) param64; | 561 | tsk = (struct task_struct *) param64; |
| 562 | #else | 562 | #else |
| 563 | tsk = *(struct task_struct **) param32; | 563 | tsk = (struct task_struct *) param32; |
| 564 | #endif | 564 | #endif |
| 565 | 565 | ||
| 566 | if (subcode & 0x0080) { | 566 | if (subcode & 0x0080) { |