Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9894a4a authored by Tony Luck's avatar Tony Luck
Browse files

[IA64] Fix annoying IA64_TR_ALLOC_MAX message. 



Madison cpus support 64 TR registers.  Increase IA64_TR_ALLOC_MAX
to 64.  Also fixup the messages that get printed when this limit
is exceeded.  Repeating for every cpu is too noisy.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 26e9a397

arch/ia64/include/asm/kregs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define IA64_TR_CURRENT_STACK	1	/* dtr1: maps kernel's memory- & register-stacks */

#define IA64_TR_CURRENT_STACK	1	/* dtr1: maps kernel's memory- & register-stacks */





#define IA64_TR_ALLOC_BASE	2 	/* itr&dtr: Base of dynamic TR resource*/

#define IA64_TR_ALLOC_BASE	2 	/* itr&dtr: Base of dynamic TR resource*/

#define IA64_TR_ALLOC_MAX	32 	/* Max number for dynamic use*/

#define IA64_TR_ALLOC_MAX	64 	/* Max number for dynamic use*/





/* Processor status register bits: */

/* Processor status register bits: */

#define IA64_PSR_BE_BIT		1

#define IA64_PSR_BE_BIT		1

arch/ia64/mm/tlb.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -362,9 +362,13 @@ ia64_tlb_init (void) 
		per_cpu(ia64_tr_num, cpu) =

		per_cpu(ia64_tr_num, cpu) =

				vm_info_1.pal_vm_info_1_s.max_dtr_entry+1;

				vm_info_1.pal_vm_info_1_s.max_dtr_entry+1;

	if (per_cpu(ia64_tr_num, cpu) > IA64_TR_ALLOC_MAX) {

	if (per_cpu(ia64_tr_num, cpu) > IA64_TR_ALLOC_MAX) {

		static int justonce = 1;

		per_cpu(ia64_tr_num, cpu) = IA64_TR_ALLOC_MAX;

		per_cpu(ia64_tr_num, cpu) = IA64_TR_ALLOC_MAX;

		printk(KERN_DEBUG "TR register number exceeds IA64_TR_ALLOC_MAX!"

		if (justonce) {

			"IA64_TR_ALLOC_MAX should be extended\n");

			justonce = 0;

			printk(KERN_DEBUG "TR register number exceeds "

			       "IA64_TR_ALLOC_MAX!\n");

		}

	}

	}

}

}