Attachment #379408 for bug #486564

Lines 292-298 static void setup_nhm(void) Link Here

(-)memtest86+-5.01-orig/controller.c (-2 / +2 lines)
292		292
293	/* First, locate the PCI bus where the MCH is located */	293	/* First, locate the PCI bus where the MCH is located */
294		294
295	for(i = 0; i < sizeof(possible_nhm_bus); i++) {	295	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
296	pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);	296	pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
297	pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);	297	pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
298	vid &= 0xFFFF;	298	vid &= 0xFFFF;
Lines 327-333 static void setup_nhm32(void) Link Here
327	ctrl.mode = ECC_NONE;	327	ctrl.mode = ECC_NONE;
328		328
329	/* First, locate the PCI bus where the MCH is located */	329	/* First, locate the PCI bus where the MCH is located */
330	for(i = 0; i < sizeof(possible_nhm_bus); i++) {	330	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
331	pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);	331	pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
332	pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);	332	pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
333	vid &= 0xFFFF;	333	vid &= 0xFFFF;

Lines 31-37 Link Here

(-)memtest86+-5.01-orig/io.h (-2 / +2 lines)
31	*/	31	*/
32		32
33	#define __OUT1(s,x) \	33	#define __OUT1(s,x) \
34	extern inline void __out##s(unsigned x value, unsigned short port) {	34	static inline void __out##s(unsigned x value, unsigned short port) {
35		35
36	#define __OUT2(s,s1,s2) \	36	#define __OUT2(s,s1,s2) \
37	__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"	37	__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
Lines 43-49 __OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" Link Here
43	__OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }	43	__OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
44		44
45	#define __IN1(s) \	45	#define __IN1(s) \
46	extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;	46	static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
47		47
48	#define __IN2(s,s1,s2) \	48	#define __IN2(s,s1,s2) \
49	__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"	49	__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"

Lines 12-18 FDISK=/dev/fd0 Link Here

(-)memtest86+-5.01-orig/Makefile (-1 / +1 lines)
12	AS=as -32	12	AS=as -32
13	CC=gcc	13	CC=gcc
14		14
15	CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \	15	CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
16	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector	16	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
17		17
18	OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \	18	OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \

Return to bug 486564