patch-2.4.13 linux/arch/alpha/kernel/sys_sx164.c

• Lines: 19
• Date: Fri Oct 12 15:35:53 2001
• Orig file: v2.4.12/linux/arch/alpha/kernel/sys_sx164.c
• Orig date: Fri Oct 27 10:55:01 2000

diff -u --recursive --new-file v2.4.12/linux/arch/alpha/kernel/sys_sx164.c linux/arch/alpha/kernel/sys_sx164.c
@@ -129,7 +129,9 @@
 	struct percpu_struct *cpu = (struct percpu_struct*)
 		((char*)hwrpb + hwrpb->processor_offset);
 
-	if (alpha_using_srm && (cpu->pal_revision & 0xffff) == 0x117) {
+	if (amask(AMASK_MAX) != 0
+	    && alpha_using_srm
+	    && (cpu->pal_revision & 0xffff) == 0x117) {
 		__asm__ __volatile__(
 		"lda	$16,8($31)\n"
 		"call_pal 9\n"		/* Allow PALRES insns in kernel mode */
@@ -160,6 +162,7 @@
 	max_dma_address:	ALPHA_MAX_DMA_ADDRESS,
 	min_io_address:		DEFAULT_IO_BASE,
 	min_mem_address:	DEFAULT_MEM_BASE,
+	pci_dac_offset:		PYXIS_DAC_OFFSET,
 
 	nr_irqs:		48,
 	device_interrupt:	pyxis_device_interrupt,