diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-08-04 13:24:41 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-08-04 13:24:41 +0930 |
| commit | b916113d820adc856aad6b8ebc1a25403ff7f293 (patch) | |
| tree | abddf239d912c4868faf9fbc69c67d980f74c7df /arch/powerpc/kernel/prom_init.c | |
| parent | 2e4db6c6be91ade074c1a150a6db2aeb4920e25c (diff) | |
| parent | b05965f284db3e086022f4e318e46cb5bffb1376 (diff) | |
| download | talos-obmc-linux-openbmc-4.4-20160804-1.tar.gz talos-obmc-linux-openbmc-4.4-20160804-1.zip | |
Merge tag 'v4.4.16' into dev-4.4openbmc-4.4-20160804-1
This is the 4.4.16 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index e52b82b71d79..b7e86e00048f 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -718,7 +718,7 @@ unsigned char ibm_architecture_vec[] = { * must match by the macro below. Update the definition if * the structure layout changes. */ -#define IBM_ARCH_VEC_NRCORES_OFFSET 125 +#define IBM_ARCH_VEC_NRCORES_OFFSET 133 W(NR_CPUS), /* number of cores supported */ 0, 0, |
