diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /arch/score/include/asm | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'arch/score/include/asm')
| -rw-r--r-- | arch/score/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/score/include/asm/pgalloc.h | 9 | ||||
| -rw-r--r-- | arch/score/include/asm/thread_info.h | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index f3414ad..e1c7bb9 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -4,4 +4,3 @@ header-y += generic-y += clkdev.h generic-y += trace_clock.h generic-y += xor.h -generic-y += preempt.h diff --git a/arch/score/include/asm/pgalloc.h b/arch/score/include/asm/pgalloc.h index 2e06765..716b3fd 100644 --- a/arch/score/include/asm/pgalloc.h +++ b/arch/score/include/asm/pgalloc.h @@ -54,12 +54,9 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, struct page *pte; pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER); - if (!pte) - return NULL; - clear_highpage(pte); - if (!pgtable_page_ctor(pte)) { - __free_page(pte); - return NULL; + if (pte) { + clear_highpage(pte); + pgtable_page_ctor(pte); } return pte; } diff --git a/arch/score/include/asm/thread_info.h b/arch/score/include/asm/thread_info.h index 656b7ad..1425cc0 100644 --- a/arch/score/include/asm/thread_info.h +++ b/arch/score/include/asm/thread_info.h @@ -72,6 +72,8 @@ register struct thread_info *__current_thread_info __asm__("r28"); #endif /* !__ASSEMBLY__ */ +#define PREEMPT_ACTIVE 0x10000000 + /* * thread information flags * - these are process state flags that various assembly files may need to |