diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2020-07-18 22:43:55 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-07-18 22:43:55 +1000 |
| commit | ef9f7cfaa50025068c69cdee8efccee12d9fabfc (patch) | |
| tree | afe8211215c04bd85763e1e37b079c9ef0f0355e /arch/powerpc/kernel/paca.c | |
| parent | powerpc/pseries: Detect secure and trusted boot state of the system. (diff) | |
| parent | selftests/powerpc: Use proper error code to check fault address (diff) | |
| download | linux-dev-ef9f7cfaa50025068c69cdee8efccee12d9fabfc.tar.xz linux-dev-ef9f7cfaa50025068c69cdee8efccee12d9fabfc.zip | |
Merge branch 'fixes' into next
Merge our fixes branch, primarily to bring in the ebb selftests build
fix and the pkey fix, which is a dependency for some future work.
Diffstat (limited to 'arch/powerpc/kernel/paca.c')
| -rw-r--r-- | arch/powerpc/kernel/paca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index 5239a421b9df..0ad15768d762 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c @@ -94,7 +94,7 @@ static void *__init alloc_shared_lppaca(unsigned long size, unsigned long limit, * This is very early in boot, so no harm done if the kernel crashes at * this point. */ - BUG_ON(shared_lppaca_size >= shared_lppaca_total_size); + BUG_ON(shared_lppaca_size > shared_lppaca_total_size); return ptr; } |