diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 22:00:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 22:00:52 -0400 |
| commit | 45f6bc5ff9c3387387f048ec85dcb4e69acf0b03 (patch) | |
| tree | d04952bb05b53a362bcd165fb910c5c1441b4c5d /arch/powerpc/include/asm/processor.h | |
| parent | 3138887bd8d18173f3c2baf1e43621c49090cd27 (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge 3.10-rc3 into usb-next
We want these fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/include/asm/processor.h')
| -rw-r--r-- | arch/powerpc/include/asm/processor.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index d7e67ca8b4a6..594db6bc093c 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h | |||
| @@ -284,6 +284,12 @@ struct thread_struct { | |||
| 284 | unsigned long ebbrr; | 284 | unsigned long ebbrr; |
| 285 | unsigned long ebbhr; | 285 | unsigned long ebbhr; |
| 286 | unsigned long bescr; | 286 | unsigned long bescr; |
| 287 | unsigned long siar; | ||
| 288 | unsigned long sdar; | ||
| 289 | unsigned long sier; | ||
| 290 | unsigned long mmcr0; | ||
| 291 | unsigned long mmcr2; | ||
| 292 | unsigned long mmcra; | ||
| 287 | #endif | 293 | #endif |
| 288 | }; | 294 | }; |
| 289 | 295 | ||
