x86/uv tree changes for v3.19
Subsystems (2)
Linus,
Please pull the latest x86-uv-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-uv-for-linus
# HEAD: 3ab0c49fd6b1e80438d0a649584d292880112262 x86: UV BAU: Increase maximum CPUs per socket/hub
Two small SGI/UV fixes.
Thanks,
Ingo
------------------>
James Custer (2):
x86: UV BAU: Avoid NULL pointer reference in ptc_seq_show
x86: UV BAU: Increase maximum CPUs per socket/hub
arch/x86/include/asm/uv/uv_bau.h | 4 ++-- arch/x86/platform/uv/tlb_uv.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)
arch/x86/include/asm/uv/uv_bau.h +2 -2
@@ -33,8 +33,8 @@* Each of the descriptors is 64 bytes in size (8*64 = 512 bytes in a set). */ -#define MAX_CPUS_PER_UVHUB 64 -#define MAX_CPUS_PER_SOCKET 32 +#define MAX_CPUS_PER_UVHUB 128 +#define MAX_CPUS_PER_SOCKET 64#define ADP_SZ 64/* hardware-provided max. */ #define UV_CPUS_PER_AS 32/* hardware-provided max. */ #define ITEMS_PER_DESC 8
arch/x86/platform/uv/tlb_uv.c +4 -0
@@ -1384,6 +1384,10 @@ static int ptc_seq_show(struct seq_file *file, void *data) }if (cpu <num_possible_cpus () &&cpu_online (cpu)) { bcp = &per_cpu (bau_control, cpu); +if (bcp->nobau) { +seq_printf (file,"cpu %d bau disabled\n" , cpu); +return 0 ; + } stat = bcp->statp;/* source side statistics */ seq_printf(file,