: remove unreliable, unused and unmainained arch from kernel.

diff -ru ./linux-2.6.9-orig/drivers/scsi/in2000.h ./linux-2.6.9/drivers/scsi/in2000.h
@@ -34,11 +34,6 @@
 #define DEBUGGING_ON       /* enable command-line debugging bitmask */
 #define DEBUG_DEFAULTS 0   /* default bitmask - change from command-line */
 
-#ifdef __i386__
-#define FAST_READ_IO       /* No problems with these on my machine */
-#define FAST_WRITE_IO
-#endif
-
 #ifdef DEBUGGING_ON
 #define DB(f,a) if (hostdata->args & (f)) a;
 #define CHECK_NULL(p,s) /* if (!(p)) {printk("\n"); while (1) printk("NP:%s\r",(s));} */

@@ -54,47 +49,6 @@
 #define write1_io(b,a)  (outb((b),hostdata->io_base+(a)))
 #define write2_io(w,a)  (outw((w),hostdata->io_base+(a)))
 
-#ifdef __i386__
-/* These inline assembly defines are derived from a patch
- * sent to me by Bill Earnest. He's done a lot of very
- * valuable thinking, testing, and coding during his effort
- * to squeeze more speed out of this driver. I really think
- * that we are doing IO at close to the maximum now with
- * the fifo. (And yes, insw uses 'edi' while outsw uses
- * 'esi'. Thanks Bill!)
- */
-
-#define FAST_READ2_IO()    \
-({ \
-int __dummy_1,__dummy_2; \
-   __asm__ __volatile__ ("\n \
-   cld                    \n \
-   orl %%ecx, %%ecx       \n \
-   jz 1f                  \n \
-   rep                    \n \
-   insw (%%dx),%%es:(%%edi) \n \
-1: "                       \
-   : "=D" (sp) ,"=c" (__dummy_1) ,"=d" (__dummy_2)  /* output */   \
-   : "2" (f), "0" (sp), "1" (i)  /* input */    \
-   );       /* trashed */ \
-})
-
-#define FAST_WRITE2_IO()   \
-({ \
-int __dummy_1,__dummy_2; \
-   __asm__ __volatile__ ("\n \
-   cld                    \n \
-   orl %%ecx, %%ecx       \n \
-   jz 1f                  \n \
-   rep                    \n \
-   outsw %%ds:(%%esi),(%%dx) \n \
-1: "                       \
-   : "=S" (sp) ,"=c" (__dummy_1) ,"=d" (__dummy_2)/* output */   \
-   : "2" (f), "0" (sp), "1" (i)  /* input */    \
-   );       /* trashed */ \
-})
-#endif
-
 /* IN2000 io_port offsets */
 #define IO_WD_ASR       0x00     /* R - 3393 auxstat reg */
 #define     ASR_INT        0x80

diff -ru ./linux-2.6.9-orig/drivers/scsi/ips.c ./linux-2.6.9/drivers/scsi/ips.c
@@ -210,8 +210,8 @@
 #define IPS_VERSION_HIGH        "7.10"
 #define IPS_VERSION_LOW         ".18 "
 
-#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)
-#warning "This driver has only been tested on the x86/ia64/x86_64 platforms"
+#if !defined(__ia64__) && !defined(__x86_64__)
+#warning "This driver has only been tested on the ia64/x86_64 platforms"
 #endif
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)

diff -ru ./linux-2.6.9-orig/drivers/scsi/NCR5380.h ./linux-2.6.9/drivers/scsi/NCR5380.h
@@ -321,7 +321,7 @@
 
 #if (defined(REAL_DMA) || defined(REAL_DMA_POLL))
 
-#if defined(i386) || defined(__alpha__)
+#if defined(__alpha__)
 
 /**
  *	NCR5380_pc_dma_setup		-	setup ISA DMA

@@ -425,7 +425,7 @@
 	
 	return tmp;
 }
-#endif				/* defined(i386) || defined(__alpha__) */
+#endif				/* defined(__alpha__) */
 #endif				/* defined(REAL_DMA)  */
 #endif				/* __KERNEL__ */
 #endif				/* ndef ASM */

diff -ru ./linux-2.6.9-orig/drivers/scsi/NCR53C9x.h ./linux-2.6.9/drivers/scsi/NCR53C9x.h
@@ -141,7 +141,7 @@
  * Yet, they all live within the same IO space.
  */
 
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 
 #ifndef MULTIPLE_PAD_SIZES
 

@@ -233,7 +233,7 @@
 
 #endif
 
-#else /* !defined(__i386__) && !defined(__x86_64__) */
+#else /* !defined(__x86_64__) */
 
 #define esp_write(__reg, __val) outb((__val), (__reg))
 #define esp_read(__reg) inb((__reg))

@@ -268,7 +268,7 @@
 #define esp_fgrnd   io_addr + 15 /* rw  Data base for fifo             0x3c  */
 };
 
-#endif /* !defined(__i386__) && !defined(__x86_64__) */
+#endif /* !defined(__x86_64__) */
 
 /* Various revisions of the ESP board. */
 enum esp_rev {

diff -ru ./linux-2.6.9-orig/drivers/scsi/scsi_ioctl.c ./linux-2.6.9/drivers/scsi/scsi_ioctl.c
@@ -193,7 +193,7 @@
  * Notes:
  *   -  The SCSI command length is determined by examining the 1st byte
  *      of the given command. There is no way to override this.
- *   -  Data transfers are limited to PAGE_SIZE (4K on i386, 8K on alpha).
+ *   -  Data transfers are limited to PAGE_SIZE (4K on normal arch, 8K on alpha).
  *   -  The length (x + y) must be at least OMAX_SB_LEN bytes long to
  *      accommodate the sense buffer when an error occurs.
  *      The sense buffer is truncated to OMAX_SB_LEN (16) bytes so that

201 lines not on this page · raw message

diff -ru ./linux-2.6.9-orig/drivers/serial/8250.c ./linux-2.6.9/drivers/serial/8250.c
@@ -782,14 +782,8 @@
 		 */
 		scratch = serial_inp(up, UART_IER);
 		serial_outp(up, UART_IER, 0);
-#ifdef __i386__
-		outb(0xff, 0x080);
-#endif
 		scratch2 = serial_inp(up, UART_IER);
 		serial_outp(up, UART_IER, 0x0F);
-#ifdef __i386__
-		outb(0, 0x080);
-#endif
 		scratch3 = serial_inp(up, UART_IER);
 		serial_outp(up, UART_IER, scratch);
 		if (scratch2 != 0 || scratch3 != 0x0F) {

diff -ru ./linux-2.6.9-orig/drivers/serial/8250.h ./linux-2.6.9/drivers/serial/8250.h
@@ -52,15 +52,7 @@
 
 #undef SERIAL_DEBUG_PCI
 
-#if defined(__i386__) && (defined(CONFIG_M386) || defined(CONFIG_M486))
-#define SERIAL_INLINE
-#endif
-  
-#ifdef SERIAL_INLINE
-#define _INLINE_ inline
-#else
 #define _INLINE_
-#endif
 
 #define PROBE_RSA	(1 << 0)
 #define PROBE_ANY	(~0)

diff -ru ./linux-2.6.9-orig/drivers/serial/sunsu.c ./linux-2.6.9/drivers/serial/sunsu.c
@@ -1151,14 +1151,8 @@
 		 */
 		scratch = serial_inp(up, UART_IER);
 		serial_outp(up, UART_IER, 0);
-#ifdef __i386__
-		outb(0xff, 0x080);
-#endif
 		scratch2 = serial_inp(up, UART_IER);
 		serial_outp(up, UART_IER, 0x0f);
-#ifdef __i386__
-		outb(0, 0x080);
-#endif
 		scratch3 = serial_inp(up, UART_IER);
 		serial_outp(up, UART_IER, scratch);
 		if (scratch2 != 0 || scratch3 != 0x0F)

diff -ru ./linux-2.6.9-orig/drivers/usb/core/devices.c ./linux-2.6.9/drivers/usb/core/devices.c
@@ -473,7 +473,7 @@
 	
 	if (level > MAX_TOPO_LEVEL)
 		return total_written;
-	/* allocate 2^1 pages = 8K (on i386); should be more than enough for one device */
+	/* allocate 2^1 pages = 8K (on the normal arch); should be more than enough for one device */
         if (!(pages_start = (char*) __get_free_pages(GFP_KERNEL,1)))
                 return -ENOMEM;
 		

diff -ru ./linux-2.6.9-orig/drivers/usb/media/ov511.c ./linux-2.6.9/drivers/usb/media/ov511.c
@@ -47,10 +47,6 @@
 #include <linux/mm.h>
 #include <linux/device.h>
 
-#if defined (__i386__)
-	#include <asm/cpufeature.h>
-#endif
-
 #include "ov511.h"
 
 /*

@@ -214,7 +210,7 @@
 static int i2c_detect_tries = 5;
 
 /* MMX support is present in kernel and CPU. Checked upon decomp module load. */
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 #define ov51x_mmx_available (cpu_has_mmx)
 #else
 #define ov51x_mmx_available (0)

297 lines not on this page · raw message

diff -ru ./linux-2.6.9-orig/drivers/video/cg6.c ./linux-2.6.9/drivers/video/cg6.c
@@ -562,7 +562,7 @@
 		cg6_cpu_name = "68020";
 		break;
 	default:
-		cg6_cpu_name = "i386";
+		cg6_cpu_name = "m68k";
 		break;
 	};
 	if (((conf >> CG6_FHC_REV_SHIFT) & CG6_FHC_REV_MASK) >= 11) {

diff -ru ./linux-2.6.9-orig/drivers/video/console/sticore.c ./linux-2.6.9/drivers/video/console/sticore.c
@@ -834,7 +834,7 @@
 		i = __raw_readl(address+0x04);
 		if (i != 1) {
 			/* The ROM could have multiple architecture 
-			 * dependent images (e.g. i386, parisc,...) */
+			 * dependent images (e.g. parisc,...) */
 			printk(KERN_WARNING 
 				"PCI ROM is not a STI ROM type image (0x%8x)\n", i);
 			goto out_err;

diff -ru ./linux-2.6.9-orig/drivers/video/fbmem.c ./linux-2.6.9/drivers/video/fbmem.c
@@ -961,7 +961,7 @@
 	pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE|_PAGE_GUARDED;
 #elif defined(__alpha__)
 	/* Caching is off in the I/O space quadrant by design.  */
-#elif defined(__i386__) || defined(__x86_64__)
+#elif defined(__x86_64__)
 	if (boot_cpu_data.x86 > 3)
 		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
 #elif defined(__mips__)

diff -ru ./linux-2.6.9-orig/drivers/video/matrox/matroxfb_base.h ./linux-2.6.9/drivers/video/matrox/matroxfb_base.h
@@ -156,7 +156,7 @@
 }
 
 static inline void mga_memcpy_toio(vaddr_t va, const void* src, int len) {
-#if defined(__alpha__) || defined(__i386__) || defined(__x86_64__)
+#if defined(__alpha__) || defined(__x86_64__)
 	/*
 	 * memcpy_toio works for us if:
 	 *  (1) Copies data as 32bit quantities, not byte after byte,

67 lines not on this page · raw message

diff -ru ./linux-2.6.9-orig/drivers/video/sgivwfb.c ./linux-2.6.9/drivers/video/sgivwfb.c
@@ -40,7 +40,6 @@
  *  The default can be overridden if the driver is compiled as a module
  */
 
-/* set by arch/i386/kernel/setup.c */
 extern unsigned long sgivwfb_mem_phys;
 extern unsigned long sgivwfb_mem_size;
 

diff -ru ./linux-2.6.9-orig/drivers/video/sis/init.c ./linux-2.6.9/drivers/video/sis/init.c
@@ -3455,7 +3455,7 @@
    SiSRegInit(SiS_Pr, BaseAddr);
    SiS_GetSysFlags(SiS_Pr, HwInfo);
 
-#if defined(LINUX_XF86) && (defined(i386) || defined(__i386) || defined(__i386__) || defined(__AMD64__))
+#if defined(LINUX_XF86) && defined(__AMD64__)
    if(pScrn) SiS_Pr->SiS_VGAINFO = SiS_GetSetBIOSScratch(pScrn, 0x489, 0xff);
    else
 #endif

@@ -3680,7 +3680,7 @@
    SiSRegInit(SiS_Pr, BaseAddr);
    SiSInitPtr(SiS_Pr, HwInfo);
    SiS_GetSysFlags(SiS_Pr, HwInfo);
-#if (defined(i386) || defined(__i386) || defined(__i386__) || defined(__AMD64__))
+#if defined(__AMD64__)
    SiS_Pr->SiS_VGAINFO = SiS_GetSetBIOSScratch(pScrn, 0x489, 0xff);
 #else
    SiS_Pr->SiS_VGAINFO = 0x11;

@@ -3860,7 +3860,7 @@
    SiSInitPtr(SiS_Pr, HwInfo);
    SiSRegInit(SiS_Pr, BaseAddr);
    SiS_GetSysFlags(SiS_Pr, HwInfo);
-#if (defined(i386) || defined(__i386) || defined(__i386__) || defined(__AMD64__))
+#if defined(__AMD64__)
    SiS_Pr->SiS_VGAINFO = SiS_GetSetBIOSScratch(pScrn, 0x489, 0xff);
 #else
    SiS_Pr->SiS_VGAINFO = 0x11;

diff -ru ./linux-2.6.9-orig/drivers/video/sis/sis_main.c ./linux-2.6.9/drivers/video/sis/sis_main.c
@@ -138,7 +138,7 @@
 	sisfb_inverse   	= 0;
 	sisfb_fontname[0] 	= 0;
 #endif
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 	sisfb_resetcard 	= 0;
 	sisfb_videoram  	= 0;
 #endif

@@ -263,7 +263,7 @@
 static void __devinit
 sisfb_get_vga_mode_from_kernel(void)
 {
-#if (defined(__i386__) || defined(__x86_64__)) && defined(CONFIG_VIDEO_SELECT)
+#if defined(__x86_64__) && defined(CONFIG_VIDEO_SELECT)
    	char mymode[32];
 	int  mydepth = screen_info.lfb_depth;
 

@@ -3954,7 +3954,7 @@
 		        }
 		} else if(this_opt[0] >= '0' && this_opt[0] <= '9') {
 			sisfb_search_mode(this_opt, TRUE);
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 	        } else if(!strnicmp(this_opt, "resetcard", 9)) {
 		  	sisfb_resetcard = 1;
 	        } else if(!strnicmp(this_opt, "videoram:", 9)) {

@@ -3983,7 +3983,7 @@
 
 	if(!(myrombase = vmalloc(65536))) return NULL;
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 
         for(temp = 0x000c0000; temp < 0x000f0000; temp += 0x00001000) {
 

@@ -4324,7 +4324,7 @@
 	reg &= 0xc3;
 	outSISIDXREG(SISCR,0x35,reg);
 	outSISIDXREG(SISCR,0x83,0x00);
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 	if(sisfb_videoram) {
 	   outSISIDXREG(SISSR,0x13,0x28);  /* ? */
 	   reg = ((sisfb_videoram >> 10) - 1) | 0x40;

@@ -4341,7 +4341,7 @@
 	      outSISIDXREG(SISSR,0x13,0x28);  /* ? */
 	      outSISIDXREG(SISSR,0x14,0x47);  /* 8MB, 64bit default */
 	   }
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 	}
 #endif
 	if(ivideo->sishw_ext.UseROM) {

@@ -4967,7 +4967,7 @@
         outSISIDXREG(SISSR, 0x05, 0x86);
 
 	if( (!sisvga_enabled)
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 		  	      || (sisfb_resetcard)
 #endif
 			      			   ) {

@@ -4982,7 +4982,7 @@
 	if(reg & 0x7f) {
 		ivideo->modeprechange = reg & 0x7f;
 	} else if(sisvga_enabled) {
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 		unsigned char SIS_IOTYPE2 *tt = ioremap(0, 0x1000);
 		if(tt) {
 		   	ivideo->modeprechange = readb(tt + 0x449);

@@ -5089,7 +5089,7 @@
 #ifdef CONFIG_FB_SIS_300
 	if(ivideo->sisvga_engine == SIS_300_VGA) {
 		if( (!sisvga_enabled)
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 		    		      || (sisfb_resetcard)
 #endif
 		  					   ) {

@@ -5103,7 +5103,7 @@
 #ifdef CONFIG_FB_SIS_315
 	if(ivideo->sisvga_engine == SIS_315_VGA) {
 		if( (!sisvga_enabled)
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 		    		     || (sisfb_resetcard)
 #endif
 		  					  ) {

@@ -5733,7 +5733,7 @@
 static int	    lvdshl = -1;
 static int	    tvxposoffset = 0, tvyposoffset = 0;
 static int	    filter = -1;
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 static int	    resetcard = 0;
 static int	    videoram = 0;
 #endif

@@ -5765,7 +5765,7 @@
 MODULE_PARM(filter, "i");
 MODULE_PARM(nocrt2rate, "i");
 MODULE_PARM(inverse, "i");
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 MODULE_PARM(resetcard, "i");
 MODULE_PARM(videoram, "i");
 #endif

@@ -5793,7 +5793,7 @@
 module_param(tvyposoffset, int, 0);
 module_param(filter, int, 0);
 module_param(nocrt2rate, int, 0);
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 module_param(resetcard, int, 0);
 module_param(videoram, int, 0);
 #endif

@@ -5925,7 +5925,7 @@
 	  "does not seem to work. (default: 0)\n");
 #endif
 
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 #ifdef CONFIG_FB_SIS_300
 MODULE_PARM_DESC(resetcard,
 	"\nSet this to 1 in order to reset (POST) the card on non-x86 machines where\n"

@@ -6001,7 +6001,7 @@
 	sisfb_tvxposoffset = tvxposoffset;
 	sisfb_tvyposoffset = tvyposoffset;
 
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
  	sisfb_resetcard = (resetcard) ? 1 : 0;
 	if(videoram)    sisfb_videoram = videoram;
 #endif

diff -ru ./linux-2.6.9-orig/drivers/video/sis/sis_main.h ./linux-2.6.9/drivers/video/sis/sis_main.h
@@ -99,7 +99,7 @@
 static int  sisfb_inverse = 0;
 static char sisfb_fontname[40];
 #endif
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 static int sisfb_resetcard = 0;
 static int sisfb_videoram = 0;
 #endif

89 lines not on this page · raw message

diff -ru ./linux-2.6.9-orig/fs/binfmt_aout.c ./linux-2.6.9/fs/binfmt_aout.c
@@ -102,7 +102,7 @@
 #	define START_DATA(u)	((u.u_tsize << PAGE_SHIFT) + u.start_code)
 #elif defined(__sparc__)
 #       define START_DATA(u)    (u.u_tsize)
-#elif defined(__i386__) || defined(__mc68000__) || defined(__arch_um__)
+#elif defined(__mc68000__) || defined(__arch_um__)
 #       define START_DATA(u)	(u.u_tsize << PAGE_SHIFT)
 #endif
 #ifdef __sparc__

@@ -232,7 +232,7 @@
 	envp = (char __user * __user *) sp;
 	sp -= argc+1;
 	argv = (char __user * __user *) sp;
-#if defined(__i386__) || defined(__mc68000__) || defined(__arm__) || defined(__arch_um__)
+#if defined(__mc68000__) || defined(__arm__) || defined(__arch_um__)
 	put_user((unsigned long) envp,--sp);
 	put_user((unsigned long) argv,--sp);
 #endif

diff -ru ./linux-2.6.9-orig/fs/binfmt_elf_fdpic.c ./linux-2.6.9/fs/binfmt_elf_fdpic.c
@@ -480,20 +480,6 @@
 
 	u_platform = (char *) sp;
 
-#if defined(__i386__) && defined(CONFIG_SMP)
-	/* in some cases (e.g. Hyper-Threading), we want to avoid L1 evictions
-	 * by the processes running on the same package. One thing we can do
-	 * is to shuffle the initial stack for them.
-	 *
-	 * the conditionals here are unneeded, but kept in to make the
-	 * code behaviour the same as pre change unless we have hyperthreaded
-	 * processors. This keeps Mr Marcelo Person happier but should be
-	 * removed for 2.5
-	 */
-	if (smp_num_siblings > 1)
-		sp = sp - ((current->pid % 64) << 7);
-#endif
-
 	sp &= ~7UL;
 
 	/* stack the load map(s) */

diff -ru ./linux-2.6.9-orig/fs/ncpfs/ncpsign_kernel.c ./linux-2.6.9/fs/ncpfs/ncpsign_kernel.c
@@ -15,11 +15,6 @@
 
 #define rol32(i,c) (((((i)&0xffffffff)<<c)&0xffffffff)| \
                     (((i)&0xffffffff)>>(32-c)))
-/* i386: 32-bit, little endian, handles mis-alignment */
-#ifdef __i386__
-#define GET_LE32(p) (*(int *)(p))
-#define PUT_LE32(p,v) { *(int *)(p)=v; }
-#else
 /* from include/ncplib.h */
 #define BVAL(buf,pos) (((__u8 *)(buf))[pos])
 #define PVAL(buf,pos) ((unsigned)BVAL(buf,pos))

@@ -50,19 +45,14 @@
 
 #define GET_LE32(p) DVAL_LH(p,0)
 #define PUT_LE32(p,v) DSET_LH(p,0,v)
-#endif
 
 static void nwsign(char *r_data1, char *r_data2, char *outdata) {
  int i;
  unsigned int w0,w1,w2,w3;
  static int rbit[4]={0, 2, 1, 3};
-#ifdef __i386__
- unsigned int *data2=(int *)r_data2;
-#else
  unsigned int data2[16];
  for (i=0;i<16;i++)
   data2[i]=GET_LE32(r_data2+(i<<2));
-#endif 
  w0=GET_LE32(r_data1);
  w1=GET_LE32(r_data1+4);
  w2=GET_LE32(r_data1+8);

diff -ru ./linux-2.6.9-orig/fs/open.c ./linux-2.6.9/fs/open.c
@@ -964,8 +964,7 @@
 #ifndef __alpha__
 
 /*
- * For backward compatibility?  Maybe this should be moved
- * into arch/i386 instead?
+ * For backward compatibility? 
  */
 asmlinkage long sys_creat(const char __user * pathname, int mode)
 {

diff -ru ./linux-2.6.9-orig/fs/stat.c ./linux-2.6.9/fs/stat.c
@@ -110,8 +110,7 @@
 #ifdef __ARCH_WANT_OLD_STAT
 
 /*
- * For backward compatibility?  Maybe this should be moved
- * into arch/i386 instead?
+ * For backward compatibility?
  */
 static int cp_old_stat(struct kstat *stat, struct __old_kernel_stat __user * statbuf)
 {

74 lines not on this page · raw message

diff -ru ./linux-2.6.9-orig/net/ipv4/netfilter/ip_conntrack_core.c ./linux-2.6.9/net/ipv4/netfilter/ip_conntrack_core.c
@@ -1151,7 +1151,7 @@
 	unsigned int i;
 	int ret;
 
-	/* Idea from tcp.c: use 1/16384 of memory.  On i386: 32MB
+	/* Idea from tcp.c: use 1/16384 of memory.  On normal machine: 32MB
 	 * machine has 256 buckets.  >= 1GB machines have 8192 buckets. */
  	if (hashsize) {
  		ip_conntrack_htable_size = hashsize;

diff -ru ./linux-2.6.9-orig/arch/ppc/boot/utils/mkbugboot.c ./linux-2.6.9/arch/ppc/boot/utils/mkbugboot.c
@@ -27,13 +27,8 @@
 #include <stdint.h>
 #endif
 
-#ifdef __i386__
-#define cpu_to_be32(x) le32_to_cpu(x)
-#define cpu_to_be16(x) le16_to_cpu(x)
-#else
 #define cpu_to_be32(x) (x)
 #define cpu_to_be16(x) (x)
-#endif
 
 #define cpu_to_le32(x) le32_to_cpu((x))
 unsigned long le32_to_cpu(unsigned long x)

diff -ru ./linux-2.6.9-orig/arch/ppc/boot/utils/mkprep.c ./linux-2.6.9/arch/ppc/boot/utils/mkprep.c
@@ -163,13 +163,8 @@
   bzero( block, sizeof block );
 
   /* set entry point and boot image size skipping over elf header */
-#ifdef __i386__
-  *entry = 0x400/*+65536*/;
-  *length = info.st_size-elfhdr_size+0x400;
-#else
   *entry = cpu_to_le32(0x400/*+65536*/);
   *length = cpu_to_le32(info.st_size-elfhdr_size+0x400);
-#endif /* __i386__ */
 
   /* sets magic number for msdos partition (used by linux) */
   block[510] = 0x55;

@@ -206,18 +201,10 @@
   pe.beginning_sector  = cpu_to_le32(1);
 #else
   /* This has to be 0 on the PowerStack? */
-#ifdef __i386__
-  pe.beginning_sector  = 0;
-#else
   pe.beginning_sector  = cpu_to_le32(0);
-#endif /* __i386__ */
 #endif
 
-#ifdef __i386__
-  pe.number_of_sectors = 2*18*80-1;
-#else
   pe.number_of_sectors = cpu_to_le32(2*18*80-1);
-#endif /* __i386__ */
 
   memcpy(&block[0x1BE], &pe, sizeof(pe));
 

diff -ru ./linux-2.6.9-orig/arch/um/os-Linux/user_syms.c ./linux-2.6.9/arch/um/os-Linux/user_syms.c
@@ -34,11 +34,6 @@
        int sym(void);                  \
        EXPORT_SYMBOL(sym);
 
-#ifdef SUBARCH_i386
-EXPORT_SYMBOL(vsyscall_ehdr);
-EXPORT_SYMBOL(vsyscall_end);
-#endif
-
 EXPORT_SYMBOL_PROTO(__errno_location);
 
 EXPORT_SYMBOL_PROTO(access);

diff -ru ./linux-2.6.9-orig/arch/x86_64/kernel/early_printk.c ./linux-2.6.9/arch/x86_64/kernel/early_printk.c
@@ -7,11 +7,7 @@
 
 /* Simple VGA output */
 
-#ifdef __i386__
-#define VGABASE		(__ISA_IO_base + 0xb8000)
-#else
 #define VGABASE		((void __iomem *)0xffffffff800b8000UL)
-#endif
 
 #define MAX_YPOS	25
 #define MAX_XPOS	80

diff -ru ./linux-2.6.9-orig/drivers/acpi/numa.c ./linux-2.6.9/drivers/acpi/numa.c
@@ -95,7 +95,7 @@
 
 	slit = (struct acpi_table_slit *) __va(phys_addr);
 
-	/* downcast just for %llu vs %lu for i386/ia64  */
+	/* downcast just for %llu vs %lu for ia64  */
 	localities = (u32) slit->localities;
 
 	acpi_numa_slit_init(slit);

diff -ru ./linux-2.6.9-orig/drivers/acpi/osl.c ./linux-2.6.9/drivers/acpi/osl.c
@@ -1017,7 +1017,7 @@
 u8
 acpi_os_readable(void *ptr, acpi_size len)
 {
-#if defined(__i386__) || defined(__x86_64__) 
+#if defined(__x86_64__) 
 	char tmp;
 	return !__get_user(tmp, (char __user *)ptr) && !__get_user(tmp, (char __user *)ptr + len - 1);
 #endif

diff -ru ./linux-2.6.9-orig/drivers/atm/eni.c ./linux-2.6.9/drivers/atm/eni.c
@@ -31,7 +31,7 @@
 #include "suni.h"
 #include "eni.h"
 
-#if !defined(__i386__) && !defined(__x86_64__)
+#if !defined(__x86_64__)
 #ifndef ioremap_nocache
 #define ioremap_nocache(X,Y) ioremap(X,Y)
 #endif 

diff -ru ./linux-2.6.9-orig/drivers/atm/fore200e.c ./linux-2.6.9/drivers/atm/fore200e.c
@@ -7,7 +7,7 @@
   Based on the PCA-200E driver from Uwe Dannowski ([email protected]).
 
   This driver simultaneously supports PCA-200E and SBA-200E adapters
-  on i386, alpha (untested), powerpc, sparc and sparc64 architectures.
+  on alpha (untested), powerpc, sparc and sparc64 architectures.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

diff -ru ./linux-2.6.9-orig/drivers/base/dmapool.c ./linux-2.6.9/drivers/base/dmapool.c
@@ -1,8 +1,6 @@
 
 #include <linux/device.h>
 #include <linux/mm.h>
-#include <asm/io.h>		/* Needed for i386 to build */
-#include <asm/scatterlist.h>	/* Needed for i386 to build */
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/slab.h>

diff -ru ./linux-2.6.9-orig/drivers/block/floppy.c ./linux-2.6.9/drivers/block/floppy.c
@@ -1832,7 +1832,7 @@
 	reset_fdc_info(0);
 
 	/* Pseudo-DMA may intercept 'reset finished' interrupt.  */
-	/* Irrelevant for systems with true DMA (i386).          */
+	/* Irrelevant for systems with true DMA.       		 */
 
 	flags = claim_dma_lock();
 	fd_disable_dma();

diff -ru ./linux-2.6.9-orig/drivers/char/agp/amd64-agp.c ./linux-2.6.9/drivers/char/agp/amd64-agp.c
@@ -370,7 +370,6 @@
 		if (fix_northbridge(loop_dev, pdev, cap_ptr) < 0) {
 			printk(KERN_ERR PFX "No usable aperture found.\n");
 #ifdef __x86_64__
-			/* should port this to i386 */
 			printk(KERN_ERR PFX "Consider rebooting with iommu=memaper=2 to get a good aperture.\n");
 #endif
 			return -1;

diff -ru ./linux-2.6.9-orig/drivers/char/drm/ati_pcigart.c ./linux-2.6.9/drivers/char/drm/ati_pcigart.c
@@ -194,7 +194,7 @@
 
 	ret = 1;
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 	wbinvd();
 #else
 	mb();

diff -ru ./linux-2.6.9-orig/drivers/char/drm/drm_init.c ./linux-2.6.9/drivers/char/drm/drm_init.c
@@ -42,9 +42,6 @@
  */
 int drm_cpu_valid(void)
 {
-#if defined(__i386__)
-	if (boot_cpu_data.x86 == 3) return 0; /* No cmpxchg on a 386 */
-#endif
 #if defined(__sparc__) && !defined(__sparc_v9__)
 	return 0; /* No cmpxchg before v9 sparc. */
 #endif

diff -ru ./linux-2.6.9-orig/drivers/char/drm/drm_proc.c ./linux-2.6.9/drivers/char/drm/drm_proc.c
@@ -473,9 +473,6 @@
 	int                   len  = 0;
 	drm_vma_entry_t	      *pt;
 	struct vm_area_struct *vma;
-#if defined(__i386__)
-	unsigned int	      pgprot;
-#endif
 
 	if (offset > DRM_PROC_LIMIT) {
 		*eof = 1;

@@ -502,19 +499,6 @@
 			       vma->vm_flags & VM_IO	   ? 'i' : '-',
 			       VM_OFFSET(vma));
 
-#if defined(__i386__)
-		pgprot = pgprot_val(vma->vm_page_prot);
-		DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c",
-			       pgprot & _PAGE_PRESENT  ? 'p' : '-',
-			       pgprot & _PAGE_RW       ? 'w' : 'r',
-			       pgprot & _PAGE_USER     ? 'u' : 's',
-			       pgprot & _PAGE_PWT      ? 't' : 'b',
-			       pgprot & _PAGE_PCD      ? 'u' : 'c',
-			       pgprot & _PAGE_ACCESSED ? 'a' : '-',
-			       pgprot & _PAGE_DIRTY    ? 'd' : '-',
-			       pgprot & _PAGE_PSE      ? 'm' : 'k',
-			       pgprot & _PAGE_GLOBAL   ? 'g' : 'l' );
-#endif
 		DRM_PROC_PRINT("\n");
 	}
 

diff -ru ./linux-2.6.9-orig/drivers/char/drm/drm_vm.c ./linux-2.6.9/drivers/char/drm/drm_vm.c
@@ -575,7 +575,7 @@
 
 	if (!capable(CAP_SYS_ADMIN) && (map->flags & _DRM_READ_ONLY)) {
 		vma->vm_flags &= ~(VM_WRITE | VM_MAYWRITE);
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 		pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW;
 #else
 				/* Ye gads this is ugly.  With more thought

@@ -604,7 +604,7 @@
 	case _DRM_FRAME_BUFFER:
 	case _DRM_REGISTERS:
 		if (VM_OFFSET(vma) >= __pa(high_memory)) {
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
 			if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
 				pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
 				pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;

118 lines not on this page · raw message

diff -ru ./linux-2.6.9-orig/drivers/char/mem.c ./linux-2.6.9/drivers/char/mem.c
@@ -42,34 +42,15 @@
  */
 static inline int uncached_access(struct file *file, unsigned long addr)
 {
-#if defined(__i386__)
-	/*
-	 * On the PPro and successors, the MTRRs are used to set
-	 * memory types for physical addresses outside main memory,
-	 * so blindly setting PCD or PWT on those pages is wrong.
-	 * For Pentiums and earlier, the surround logic should disable
-	 * caching for the high addresses through the KEN pin, but
-	 * we maintain the tradition of paranoia in this code.
-	 */
-	if (file->f_flags & O_SYNC)
-		return 1;
- 	return !( test_bit(X86_FEATURE_MTRR, boot_cpu_data.x86_capability) ||
-		  test_bit(X86_FEATURE_K6_MTRR, boot_cpu_data.x86_capability) ||
-		  test_bit(X86_FEATURE_CYRIX_ARR, boot_cpu_data.x86_capability) ||
-		  test_bit(X86_FEATURE_CENTAUR_MCR, boot_cpu_data.x86_capability) )
-	  && addr >= __pa(high_memory);
-#elif defined(__x86_64__)
+#if defined(__x86_64__)
 	/* 
 	 * This is broken because it can generate memory type aliases,
 	 * which can cause cache corruptions
-	 * But it is only available for root and we have to be bug-to-bug
-	 * compatible with i386.
+	 * But it is only available for root.
 	 */
 	if (file->f_flags & O_SYNC)
 		return 1;
-	/* same behaviour as i386. PAT always set to cached and MTRRs control the
-	   caching behaviour. 
-	   Hopefully a full PAT implementation will fix that soon. */	   
+	   /* Hopefully a full PAT implementation will fix that soon. */	   
 	return 0;
 #elif defined(CONFIG_IA64)
 	/*

diff -ru ./linux-2.6.9-orig/drivers/char/nvram.c ./linux-2.6.9/drivers/char/nvram.c
@@ -49,7 +49,7 @@
 /* select machine configuration */
 #if defined(CONFIG_ATARI)
 #  define MACH ATARI
-#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__)  /* and others?? */
+#elif defined(__x86_64__) || defined(__arm__)  /* and others?? */
 #define MACH PC
 #  if defined(CONFIG_COBALT)
 #    include <linux/cobalt-nvram.h>

diff -ru ./linux-2.6.9-orig/drivers/char/pcmcia/synclink_cs.c ./linux-2.6.9/drivers/char/pcmcia/synclink_cs.c
@@ -27,11 +27,7 @@
  */
 
 #define VERSION(ver,rel,seq) (((ver)<<16) | ((rel)<<8) | (seq))
-#if defined(__i386__)
-#  define BREAKPOINT() asm("   int $3");
-#else
 #  define BREAKPOINT() { }
-#endif
 
 #define MAX_DEVICE_COUNT 4
 

diff -ru ./linux-2.6.9-orig/drivers/char/random.c ./linux-2.6.9/drivers/char/random.c
@@ -412,25 +412,10 @@
  *
  *****************************************************************/
 
-/*
- * Unfortunately, while the GCC optimizer for the i386 understands how
- * to optimize a static rotate left of x bits, it doesn't know how to
- * deal with a variable rotate of x bits.  So we use a bit of asm magic.
- */
-#if (!defined (__i386__))
 static inline __u32 rotate_left(int i, __u32 word)
 {
 	return (word << i) | (word >> (32 - i));
 }
-#else
-static inline __u32 rotate_left(int i, __u32 word)
-{
-	__asm__("roll %%cl,%0"
-		:"=r" (word)
-		:"0" (word),"c" (i));
-	return word;
-}
-#endif
 
 /*
  * More asm magic....

@@ -996,7 +981,7 @@
 #if SHA_CODE_SIZE == 0
 	/*
 	 * Approximately 50% of the speed of the largest version, but
-	 * takes up 1/16 the space.  Saves about 6k on an i386 kernel.
+	 * takes up 1/16 the space.
 	 */
 	for (i = 0; i < 80; i++) {
 		if (i < 40) {

diff -ru ./linux-2.6.9-orig/drivers/char/rtc.c ./linux-2.6.9/drivers/char/rtc.c
@@ -82,10 +82,6 @@
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-#if defined(__i386__)
-#include <asm/hpet.h>
-#endif
-
 #ifdef __sparc__
 #include <linux/pci.h>
 #include <asm/ebus.h>

diff -ru ./linux-2.6.9-orig/drivers/char/synclink.c ./linux-2.6.9/drivers/char/synclink.c
@@ -53,11 +53,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(__i386__)
-#  define BREAKPOINT() asm("   int $3");
-#else
 #  define BREAKPOINT() { }
-#endif
 
 #define MAX_ISA_DEVICES 10
 #define MAX_PCI_DEVICES 10

diff -ru ./linux-2.6.9-orig/drivers/char/synclinkmp.c ./linux-2.6.9/drivers/char/synclinkmp.c
@@ -26,11 +26,7 @@
  */
 
 #define VERSION(ver,rel,seq) (((ver)<<16) | ((rel)<<8) | (seq))
-#if defined(__i386__)
-#  define BREAKPOINT() asm("   int $3");
-#else
 #  define BREAKPOINT() { }
-#endif
 
 #define MAX_DEVICES 12
 

diff -ru ./linux-2.6.9-orig/drivers/char/vt_ioctl.c ./linux-2.6.9/drivers/char/vt_ioctl.c
@@ -428,24 +428,8 @@
 		 *
 		 * XXX: you should never use these, just call ioperm directly..
 		 */
-#ifdef CONFIG_X86
-	case KDADDIO:
-	case KDDELIO:
-		/*
-		 * KDADDIO and KDDELIO may be able to add ports beyond what
-		 * we reject here, but to be safe...
-		 */
-		if (arg < GPFIRST || arg > GPLAST)
-			return -EINVAL;
-		return sys_ioperm(arg, 1, (cmd == KDADDIO)) ? -ENXIO : 0;
-
-	case KDENABIO:
-	case KDDISABIO:
-		return sys_ioperm(GPFIRST, GPNUM,
-				  (cmd == KDENABIO)) ? -ENXIO : 0;
-#endif
 
-	/* Linux m68k/i386 interface for setting the keyboard delay/repeat rate */
+	/* Linux m68k interface for setting the keyboard delay/repeat rate */
 		
 	case KDKBDREP:
 	{

62 lines not on this page · raw message

diff -ru ./linux-2.6.9-orig/drivers/ide/pci/cmd64x.c ./linux-2.6.9/drivers/ide/pci/cmd64x.c
@@ -606,13 +606,6 @@
 	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
 	class_rev &= 0xff;
 
-#ifdef __i386__
-	if (dev->resource[PCI_ROM_RESOURCE].start) {
-		pci_write_config_byte(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start);
-	}
-#endif
-
 	switch(dev->device) {
 		case PCI_DEVICE_ID_CMD_643:
 			break;

@@ -662,11 +655,7 @@
 	(void) pci_write_config_byte(dev, DRWTIM0,  0x3f);
 	(void) pci_write_config_byte(dev, ARTTIM1,  0x40);
 	(void) pci_write_config_byte(dev, DRWTIM1,  0x3f);
-#ifdef __i386__
-	(void) pci_write_config_byte(dev, ARTTIM23, 0x1c);
-#else
 	(void) pci_write_config_byte(dev, ARTTIM23, 0x5c);
-#endif
 	(void) pci_write_config_byte(dev, DRWTIM23, 0x3f);
 	(void) pci_write_config_byte(dev, DRWTIM3,  0x3f);
 #ifdef CONFIG_PPC

68 lines not on this page · raw message

diff -ru ./linux-2.6.9-orig/drivers/input/joystick/analog.c ./linux-2.6.9/drivers/input/joystick/analog.c
@@ -140,25 +140,7 @@
  * Time macros.
  */
 
-#ifdef __i386__
-#define GET_TIME(x)	do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0)
-#define DELTA(x,y)	(cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? CLOCK_TICK_RATE / HZ : 0)))
-#define TIME_NAME	(cpu_has_tsc?"TSC":"PIT")
-static unsigned int get_time_pit(void)
-{
-        extern spinlock_t i8253_lock;
-        unsigned long flags;
-        unsigned int count;
-
-        spin_lock_irqsave(&i8253_lock, flags);
-        outb_p(0x00, 0x43);
-        count = inb_p(0x40);
-        count |= inb_p(0x40) << 8;
-        spin_unlock_irqrestore(&i8253_lock, flags);
-
-        return count;
-}
-#elif defined(__x86_64__)
+#if defined(__x86_64__)
 #define GET_TIME(x)	rdtscl(x)
 #define DELTA(x,y)	((y)-(x))
 #define TIME_NAME	"TSC"

diff -ru ./linux-2.6.9-orig/drivers/input/keyboard/atkbd.c ./linux-2.6.9/drivers/input/keyboard/atkbd.c
@@ -38,7 +38,7 @@
 module_param_named(set, atkbd_set, int, 0);
 MODULE_PARM_DESC(set, "Select keyboard code set (2 = default, 3 = PS/2 native)");
 
-#if defined(__i386__) || defined(__x86_64__) || defined(__hppa__)
+#if defined(__x86_64__) || defined(__hppa__)
 static int atkbd_reset;
 #else
 static int atkbd_reset = 1;

@@ -258,7 +258,7 @@
 	printk(KERN_DEBUG "atkbd.c: Received %02x flags %02x\n", data, flags);
 #endif
 
-#if !defined(__i386__) && !defined (__x86_64__)
+#if !defined (__x86_64__)
 	if ((flags & (SERIO_FRAME | SERIO_PARITY)) && (~flags & SERIO_TIMEOUT) && !atkbd->resend && atkbd->write) {
 		printk(KERN_WARNING "atkbd.c: frame/parity error: %02x\n", flags);
 		serio_write(serio, ATKBD_CMD_RESEND);

diff -ru ./linux-2.6.9-orig/drivers/input/serio/i8042-x86ia64io.h ./linux-2.6.9/drivers/input/serio/i8042-x86ia64io.h
@@ -63,31 +63,6 @@
 	outb(val, I8042_COMMAND_REG);
 }
 
-#if defined(__i386__)
-
-#include <linux/dmi.h>
-
-static struct dmi_system_id __initdata i8042_dmi_table[] = {
-	{
-		.ident = "Compaq Proliant 8500",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
-			DMI_MATCH(DMI_PRODUCT_NAME , "ProLiant"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "8500"),
-		},
-	},
-	{
-		.ident = "Compaq Proliant DL760",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
-			DMI_MATCH(DMI_PRODUCT_NAME , "ProLiant"),
-			DMI_MATCH(DMI_PRODUCT_VERSION, "DL760"),
-		},
-	},
-	{ }
-};
-#endif
-
 #ifdef CONFIG_ACPI
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>

@@ -290,11 +265,6 @@
         i8042_reset = 1;
 #endif
 
-#if defined(__i386__)
-	if (dmi_check_system(i8042_dmi_table))
-		i8042_noloop = 1;
-#endif
-
 	return 0;
 }
 

diff -ru ./linux-2.6.9-orig/drivers/isdn/i4l/isdn_audio.c ./linux-2.6.9/drivers/isdn/i4l/isdn_audio.c
@@ -195,21 +195,8 @@
 static inline void
 isdn_audio_tlookup(const u_char *table, u_char *buff, unsigned long n)
 {
-#ifdef __i386__
-	unsigned long d0, d1, d2, d3;
-	__asm__ __volatile__(
-		"cld\n"
-		"1:\tlodsb\n\t"
-		"xlatb\n\t"
-		"stosb\n\t"
-		"loop 1b\n\t"
-	:	"=&b"(d0), "=&c"(d1), "=&D"(d2), "=&S"(d3)
-	:	"0"((long) table), "1"(n), "2"((long) buff), "3"((long) buff)
-	:	"memory", "ax");
-#else
 	while (n--)
 		*buff = table[*(unsigned char *)buff], buff++;
-#endif
 }
 
 void

diff -ru ./linux-2.6.9-orig/drivers/macintosh/apm_emu.c ./linux-2.6.9/drivers/macintosh/apm_emu.c
@@ -2,8 +2,7 @@
  * 
  * Copyright 2001 Benjamin Herrenschmidt ([email protected])
  *
- * Lots of code inherited from apm.c, see appropriate notice in
- *  arch/i386/kernel/apm.c
+ * Lots of code inherited from apm.c
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff -ru ./linux-2.6.9-orig/drivers/md/raid6algos.c ./linux-2.6.9/drivers/md/raid6algos.c
@@ -51,14 +51,6 @@
 	&raid6_intx16,
 	&raid6_intx32,
 #endif
-#if defined(__i386__)
-	&raid6_mmxx1,
-	&raid6_mmxx2,
-	&raid6_sse1x1,
-	&raid6_sse1x2,
-	&raid6_sse2x1,
-	&raid6_sse2x2,
-#endif
 #if defined(__x86_64__)
 	&raid6_sse2x1,
 	&raid6_sse2x2,

diff -ru ./linux-2.6.9-orig/drivers/media/video/zoran_driver.c ./linux-2.6.9/drivers/media/video/zoran_driver.c
@@ -4556,7 +4556,6 @@
 				pos =
 				    le32_to_cpu((unsigned long) fh->jpg_buffers.
 				    buffer[i].frag_tab[2 * j]);
-				/* should just be pos on i386 */
 				page = virt_to_phys(bus_to_virt(pos))
 								>> PAGE_SHIFT;
 				if (remap_pfn_range(vma, start, page,

diff -ru ./linux-2.6.9-orig/drivers/mtd/devices/docprobe.c ./linux-2.6.9/drivers/mtd/devices/docprobe.c
@@ -66,7 +66,7 @@
 MODULE_PARM_DESC(doc_config_location, "Physical memory address at which to probe for DiskOnChip");
 
 static unsigned long __initdata doc_locations[] = {
-#if defined (__alpha__) || defined(__i386__) || defined(__x86_64__)
+#if defined (__alpha__) || defined(__x86_64__)
 #ifdef CONFIG_MTD_DOCPROBE_HIGH
 	0xfffc8000, 0xfffca000, 0xfffcc000, 0xfffce000, 
 	0xfffd0000, 0xfffd2000, 0xfffd4000, 0xfffd6000,

diff -ru ./linux-2.6.9-orig/drivers/mtd/nand/diskonchip.c ./linux-2.6.9/drivers/mtd/nand/diskonchip.c
@@ -40,7 +40,7 @@
 #endif
 
 static unsigned long __initdata doc_locations[] = {
-#if defined (__alpha__) || defined(__i386__) || defined(__x86_64__)
+#if defined (__alpha__) || defined(__x86_64__)
 #ifdef CONFIG_MTD_DISKONCHIP_PROBE_HIGH
 	0xfffc8000, 0xfffca000, 0xfffcc000, 0xfffce000, 
 	0xfffd0000, 0xfffd2000, 0xfffd4000, 0xfffd6000,

diff -ru ./linux-2.6.9-orig/drivers/net/fealnx.c ./linux-2.6.9/drivers/net/fealnx.c
@@ -900,23 +900,6 @@
 //   np->bcrvalue=0x38;           /* little-endian, 256 burst length */
 	np->bcrvalue = 0x10;	/* little-endian, 8 burst length */
 	np->crvalue = 0xe00;	/* rx 128 burst length */
-#elif defined(__i386__)
-#if defined(MODULE)
-// 89/9/1 modify, 
-//   np->bcrvalue=0x38;           /* little-endian, 256 burst length */
-	np->bcrvalue = 0x10;	/* little-endian, 8 burst length */
-	np->crvalue = 0xe00;	/* rx 128 burst length */
-#else
-	/* When not a module we can work around broken '486 PCI boards. */
-#define x86 boot_cpu_data.x86
-// 89/9/1 modify, 
-//   np->bcrvalue=(x86 <= 4 ? 0x10 : 0x38);
-	np->bcrvalue = 0x10;
-	np->crvalue = (x86 <= 4 ? 0xa00 : 0xe00);
-	if (x86 <= 4)
-		printk(KERN_INFO "%s: This is a 386/486 PCI system, setting burst "
-		       "length to %x.\n", dev->name, (x86 <= 4 ? 0x10 : 0x38));
-#endif
 #else
 // 89/9/1 modify,
 //   np->bcrvalue=0x38;

diff -ru ./linux-2.6.9-orig/drivers/net/hamachi.c ./linux-2.6.9/drivers/net/hamachi.c
@@ -1757,35 +1757,6 @@
 	writel(2, ioaddr + RxCmd);
 	writew(2, ioaddr + TxCmd);
 
-#ifdef __i386__
-	if (hamachi_debug > 2) {
-		printk("\n"KERN_DEBUG"  Tx ring at %8.8x:\n",
-			   (int)hmp->tx_ring_dma);
-		for (i = 0; i < TX_RING_SIZE; i++)
-			printk(" %c #%d desc. %8.8x %8.8x.\n",
-				   readl(ioaddr + TxCurPtr) == (long)&hmp->tx_ring[i] ? '>' : ' ',
-				   i, hmp->tx_ring[i].status_n_length, hmp->tx_ring[i].addr);
-		printk("\n"KERN_DEBUG "  Rx ring %8.8x:\n",
-			   (int)hmp->rx_ring_dma);
-		for (i = 0; i < RX_RING_SIZE; i++) {
-			printk(KERN_DEBUG " %c #%d desc. %4.4x %8.8x\n",
-				   readl(ioaddr + RxCurPtr) == (long)&hmp->rx_ring[i] ? '>' : ' ',
-				   i, hmp->rx_ring[i].status_n_length, hmp->rx_ring[i].addr);
-			if (hamachi_debug > 6) {
-				if (*(u8*)hmp->rx_skbuff[i]->tail != 0x69) {
-					u16 *addr = (u16 *)
-						hmp->rx_skbuff[i]->tail;
-					int j;
-
-					for (j = 0; j < 0x50; j++)
-						printk(" %4.4x", addr[j]);
-					printk("\n");
-				}
-			}
-		}
-	}
-#endif /* __i386__ debugging only */
-
 	free_irq(dev->irq, dev);
 
 	del_timer_sync(&hmp->timer);

diff -ru ./linux-2.6.9-orig/drivers/net/hamradio/baycom_epp.c ./linux-2.6.9/drivers/net/hamradio/baycom_epp.c
@@ -727,16 +727,7 @@
 
 /* --------------------------------------------------------------------- */
 
-#ifdef __i386__
-#include <asm/msr.h>
-#define GETTICK(x)                                                \
-({                                                                \
-	if (cpu_has_tsc)                                          \
-		rdtscl(x);                                        \
-})
-#else /* __i386__ */
 #define GETTICK(x)
-#endif /* __i386__ */
 
 static void epp_bh(struct net_device *dev)
 {

diff -ru ./linux-2.6.9-orig/drivers/net/starfire.c ./linux-2.6.9/drivers/net/starfire.c
@@ -271,7 +271,7 @@
  * This SUCKS.
  * We need a much better method to determine if dma_addr_t is 64-bit.
  */
-#if (defined(__i386__) && defined(CONFIG_HIGHMEM) && (LINUX_VERSION_CODE > 0x20500 || defined(CONFIG_HIGHMEM64G))) || defined(__x86_64__) || defined (__ia64__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
+#if (defined(CONFIG_HIGHMEM) && (LINUX_VERSION_CODE > 0x20500 || defined(CONFIG_HIGHMEM64G))) || defined(__x86_64__) || defined (__ia64__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR))
 /* 64-bit dma_addr_t */
 #define ADDR_64BITS	/* This chip uses 64 bit addresses. */
 #define cpu_to_dma(x) cpu_to_le64(x)

diff -ru ./linux-2.6.9-orig/drivers/net/sundance.c ./linux-2.6.9/drivers/net/sundance.c
@@ -1689,24 +1689,6 @@
 	tasklet_kill(&np->rx_tasklet);
 	tasklet_kill(&np->tx_tasklet);
 
-#ifdef __i386__
-	if (netif_msg_hw(np)) {
-		printk("\n"KERN_DEBUG"  Tx ring at %8.8x:\n",
-			   (int)(np->tx_ring_dma));
-		for (i = 0; i < TX_RING_SIZE; i++)
-			printk(" #%d desc. %4.4x %8.8x %8.8x.\n",
-				   i, np->tx_ring[i].status, np->tx_ring[i].frag[0].addr,
-				   np->tx_ring[i].frag[0].length);
-		printk("\n"KERN_DEBUG "  Rx ring %8.8x:\n",
-			   (int)(np->rx_ring_dma));
-		for (i = 0; i < /*RX_RING_SIZE*/4 ; i++) {
-			printk(KERN_DEBUG " #%d desc. %4.4x %4.4x %8.8x\n",
-				   i, np->rx_ring[i].status, np->rx_ring[i].frag[0].addr,
-				   np->rx_ring[i].frag[0].length);
-		}
-	}
-#endif /* __i386__ debugging only */
-
 	free_irq(dev->irq, dev);
 
 	del_timer_sync(&np->timer);

diff -ru ./linux-2.6.9-orig/drivers/net/tulip/tulip_core.c ./linux-2.6.9/drivers/net/tulip/tulip_core.c
@@ -90,7 +90,7 @@
 
 #if defined(__alpha__) || defined(__ia64__)
 static int csr0 = 0x01A00000 | 0xE000;
-#elif defined(__i386__) || defined(__powerpc__) || defined(__x86_64__)
+#elif defined(__powerpc__) || defined(__x86_64__)
 static int csr0 = 0x01A00000 | 0x8000;
 #elif defined(__sparc__) || defined(__hppa__)
 /* The UltraSparc PCI controllers will disconnect at every 64-byte

@@ -1570,10 +1570,6 @@
 			    dev->dev_addr, 6);
 		}
 #endif
-#if defined(__i386__)		/* Patch up x86 BIOS bug. */
-		if (last_irq)
-			irq = last_irq;
-#endif
 	}
 
 	for (i = 0; i < 6; i++)

diff -ru ./linux-2.6.9-orig/drivers/net/tulip/tulip.h ./linux-2.6.9/drivers/net/tulip/tulip.h
@@ -294,11 +294,7 @@
 
 #define RUN_AT(x) (jiffies + (x))
 
-#if defined(__i386__)			/* AKA get_unaligned() */
-#define get_u16(ptr) (*(u16 *)(ptr))
-#else
 #define get_u16(ptr) (((u8*)(ptr))[0] + (((u8*)(ptr))[1]<<8))
-#endif
 
 struct medialeaf {
 	u8 type;

diff -ru ./linux-2.6.9-orig/drivers/net/tulip/winbond-840.c ./linux-2.6.9/drivers/net/tulip/winbond-840.c
@@ -926,16 +926,7 @@
 		8000	16 longwords		0200 2 longwords	2000 32 longwords
 		C000	32  longwords		0400 4 longwords */
 
-#if defined (__i386__) && !defined(MODULE)
-	/* When not a module we can work around broken '486 PCI boards. */
-	if (boot_cpu_data.x86 <= 4) {
-		i |= 0x4800;
-		printk(KERN_INFO "%s: This is a 386/486 PCI system, setting cache "
-			   "alignment to 8 longwords.\n", dev->name);
-	} else {
-		i |= 0xE000;
-	}
-#elif defined(__powerpc__) || defined(__i386__) || defined(__alpha__) || defined(__ia64__) || defined(__x86_64__)
+#if defined(__powerpc__) || defined(__alpha__) || defined(__ia64__) || defined(__x86_64__)
 	i |= 0xE000;
 #elif defined(__sparc__)
 	i |= 0x4800;

@@ -1552,26 +1543,6 @@
 	if (ioread32(ioaddr + NetworkConfig) != 0xffffffff)
 		np->stats.rx_missed_errors += ioread32(ioaddr + RxMissed) & 0xffff;
 
-#ifdef __i386__
-	if (debug > 2) {
-		int i;
-
-		printk(KERN_DEBUG"  Tx ring at %8.8x:\n",
-			   (int)np->tx_ring);
-		for (i = 0; i < TX_RING_SIZE; i++)
-			printk(KERN_DEBUG " #%d desc. %4.4x %4.4x %8.8x.\n",
-				   i, np->tx_ring[i].length,
-				   np->tx_ring[i].status, np->tx_ring[i].buffer1);
-		printk("\n"KERN_DEBUG "  Rx ring %8.8x:\n",
-			   (int)np->rx_ring);
-		for (i = 0; i < RX_RING_SIZE; i++) {
-			printk(KERN_DEBUG " #%d desc. %4.4x %4.4x %8.8x\n",
-				   i, np->rx_ring[i].length,
-				   np->rx_ring[i].status, np->rx_ring[i].buffer1);
-		}
-	}
-#endif /* __i386__ debugging only */
-
 	del_timer_sync(&np->timer);
 
 	free_rxtx_rings(np);

diff -ru ./linux-2.6.9-orig/drivers/net/tulip/xircom_tulip_cb.c ./linux-2.6.9/drivers/net/tulip/xircom_tulip_cb.c
@@ -82,9 +82,6 @@
 static int csr0 = 0x01B00000 | 0x8000;
 #elif defined(__sparc__)
 static int csr0 = 0x01B00080 | 0x8000;
-#elif defined(__i386__)
-static int csr0 = 0x01A00000 | 0x8000;
-#else
 #warning Processor architecture undefined!
 static int csr0 = 0x00A00000 | 0x4800;
 #endif

diff -ru ./linux-2.6.9-orig/drivers/net/wan/sbni.c ./linux-2.6.9/drivers/net/wan/sbni.c
@@ -148,10 +148,6 @@
 static int  emancipate( struct net_device * );
 #endif
 
-#ifdef __i386__
-#define ASM_CRC 1
-#endif
-
 static const char  version[] =
 	"Granch SBNI12 driver ver 5.0.1  Jun 22 2001  Denis I.Timofeev.\n";
 

diff -ru ./linux-2.6.9-orig/drivers/net/wireless/wl3501_cs.c ./linux-2.6.9/drivers/net/wireless/wl3501_cs.c
@@ -62,9 +62,7 @@
 
 #include "wl3501.h"
 
-#ifndef __i386__
 #define slow_down_io()
-#endif
 
 /* For rough constant delay */
 #define WL3501_NOPLOOP(n) { int x = 0; while (x++ < n) slow_down_io(); }

diff -ru ./linux-2.6.9-orig/drivers/net/yellowfin.c ./linux-2.6.9/drivers/net/yellowfin.c
@@ -1267,41 +1267,6 @@
 
 	del_timer(&yp->timer);
 
-#if defined(__i386__)
-	if (yellowfin_debug > 2) {
-		printk("\n"KERN_DEBUG"  Tx ring at %8.8llx:\n",
-				(unsigned long long)yp->tx_ring_dma);
-		for (i = 0; i < TX_RING_SIZE*2; i++)
-			printk(" %c #%d desc. %8.8x %8.8x %8.8x %8.8x.\n",
-				   ioread32(ioaddr + TxPtr) == (long)&yp->tx_ring[i] ? '>' : ' ',
-				   i, yp->tx_ring[i].dbdma_cmd, yp->tx_ring[i].addr,
-				   yp->tx_ring[i].branch_addr, yp->tx_ring[i].result_status);
-		printk(KERN_DEBUG "  Tx status %p:\n", yp->tx_status);
-		for (i = 0; i < TX_RING_SIZE; i++)
-			printk("   #%d status %4.4x %4.4x %4.4x %4.4x.\n",
-				   i, yp->tx_status[i].tx_cnt, yp->tx_status[i].tx_errs,
-				   yp->tx_status[i].total_tx_cnt, yp->tx_status[i].paused);
-
-		printk("\n"KERN_DEBUG "  Rx ring %8.8llx:\n",
-				(unsigned long long)yp->rx_ring_dma);
-		for (i = 0; i < RX_RING_SIZE; i++) {
-			printk(KERN_DEBUG " %c #%d desc. %8.8x %8.8x %8.8x\n",
-				   ioread32(ioaddr + RxPtr) == (long)&yp->rx_ring[i] ? '>' : ' ',
-				   i, yp->rx_ring[i].dbdma_cmd, yp->rx_ring[i].addr,
-				   yp->rx_ring[i].result_status);
-			if (yellowfin_debug > 6) {
-				if (get_unaligned((u8*)yp->rx_ring[i].addr) != 0x69) {
-					int j;
-					for (j = 0; j < 0x50; j++)
-						printk(" %4.4x",
-							   get_unaligned(((u16*)yp->rx_ring[i].addr) + j));
-					printk("\n");
-				}
-			}
-		}
-	}
-#endif /* __i386__ debugging only */
-
 	free_irq(dev->irq, dev);
 
 	/* Free all the skbuffs in the Rx queue. */

diff -ru ./linux-2.6.9-orig/drivers/parisc/iosapic.c ./linux-2.6.9/drivers/parisc/iosapic.c
@@ -713,7 +713,7 @@
  * PCI only supports level triggered in order to share IRQ lines.
  * ergo I/O SAPIC must always issue EOI on parisc.
  *
- * i386/ia64 support ISA devices and have to deal with
+ * ia64 support ISA devices and have to deal with
  * edge-triggered interrupts too.
  */
 static void iosapic_end_irq(unsigned int irq)

diff -ru ./linux-2.6.9-orig/drivers/pci/hotplug/pciehp_pci.c ./linux-2.6.9/drivers/pci/hotplug/pciehp_pci.c
@@ -37,10 +37,6 @@
 #include <linux/pci.h>
 #include "../pci.h"
 #include "pciehp.h"
-#ifndef CONFIG_IA64
-#include "../../../arch/i386/pci/pci.h"    /* horrible hack showing how processor dependant we are... */
-#endif
-
 
 int pciehp_configure_device (struct controller* ctrl, struct pci_func* func)  
 {

diff -ru ./linux-2.6.9-orig/drivers/pci/hotplug/shpchp_pci.c ./linux-2.6.9/drivers/pci/hotplug/shpchp_pci.c
@@ -37,9 +37,6 @@
 #include <linux/pci.h>
 #include "../pci.h"
 #include "shpchp.h"
-#ifndef CONFIG_IA64
-#include "../../../arch/i386/pci/pci.h"    /* horrible hack showing how processor dependant we are... */
-#endif
 
 int shpchp_configure_device (struct controller* ctrl, struct pci_func* func)  
 {

diff -ru ./linux-2.6.9-orig/drivers/pnp/manager.c ./linux-2.6.9/drivers/pnp/manager.c
@@ -124,7 +124,7 @@
 	unsigned long *start, *end, *flags;
 	int i;
 
-	/* IRQ priority: this table is good for i386 */
+	/* IRQ priority */
 	static unsigned short xtab[16] = {
 		5, 10, 11, 12, 9, 14, 15, 7, 3, 4, 13, 0, 1, 6, 8, 2
 	};

@@ -176,7 +176,7 @@
 	unsigned long *start, *end, *flags;
 	int i;
 
-	/* DMA priority: this table is good for i386 */
+	/* DMA priority */
 	static unsigned short xtab[8] = {
 		1, 3, 5, 6, 7, 0, 2, 4
 	};

diff -ru ./linux-2.6.9-orig/drivers/pnp/system.c ./linux-2.6.9/drivers/pnp/system.c
@@ -62,14 +62,6 @@
 			/* Do nothing */
 			continue;
 		if (pnp_port_start(dev, i) < 0x100)
-			/*
-			 * Below 0x100 is only standard PC hardware
-			 * (pics, kbd, timer, dma, ...)
-			 * We should not get resource conflicts there,
-			 * and the kernel reserves these anyway
-			 * (see arch/i386/kernel/setup.c).
-			 * So, do nothing
-			 */
 			continue;
 		if (pnp_port_end(dev, i) < pnp_port_start(dev, i))
 			/* invalid endpoint */

148 lines not on this page · raw message

97 lines not on this page · raw message

102 lines not on this page · raw message

diff -ru ./linux-2.6.9-orig/drivers/scsi/aic7xxx/aic7xxx_osm.h ./linux-2.6.9/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -809,7 +809,7 @@
 
 /**************************** VL/EISA Routines ********************************/
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) \
-  && (defined(__i386__) || defined(__alpha__)) \
+  && defined(__alpha__) \
   && (!defined(CONFIG_EISA)))
 #define CONFIG_EISA
 #endif

diff -ru ./linux-2.6.9-orig/drivers/scsi/aic7xxx_old.c ./linux-2.6.9/drivers/scsi/aic7xxx_old.c
@@ -265,7 +265,7 @@
 #  define FALSE 0
 #endif
 
-#if defined(__powerpc__) || defined(__i386__) || defined(__x86_64__)
+#if defined(__powerpc__) || defined(__x86_64__)
 #  define MMAPIO
 #endif
 

@@ -6813,7 +6813,7 @@
  *   we #ifdef this entire function to avoid compiler warnings about
  *   an unused function.
  *-F*************************************************************************/
-#if defined(__i386__) || defined(__alpha__)
+#if defined(__alpha__)
 static int
 aic7xxx_probe(int slot, int base, ahc_flag_type *flags)
 {

@@ -6873,7 +6873,7 @@
 
   return (-1);
 }
-#endif /* (__i386__) || (__alpha__) */
+#endif /* (__alpha__) */
 
 
 /*+F*************************************************************************

@@ -8999,12 +8999,12 @@
   struct aic7xxx_host *current_p = NULL;
   struct aic7xxx_host *list_p = NULL;
   int found = 0;
-#if defined(__i386__) || defined(__alpha__)
+#if defined(__alpha__)
   ahc_flag_type flags = 0;
   int type;
 #endif
   unsigned char sxfrctl1;
-#if defined(__i386__) || defined(__alpha__)
+#if defined(__alpha__)
   unsigned char hcntrl, hostconf;
   unsigned int slot, base;
 #endif

@@ -9687,7 +9687,7 @@
   }
 #endif /* CONFIG_PCI */
 
-#if defined(__i386__) || defined(__alpha__)
+#if defined(__alpha__)
   /*
    * EISA/VL-bus card signature probe.
    */

@@ -9916,7 +9916,7 @@
     found++;
   }
 
-#endif /* defined(__i386__) || defined(__alpha__) */
+#endif /* defined(__alpha__) */
 
   /*
    * Now, we re-order the probed devices by BIOS address and BUS class.

diff -ru ./linux-2.6.9-orig/drivers/scsi/BusLogic.h ./linux-2.6.9/drivers/scsi/BusLogic.h
@@ -39,10 +39,8 @@
   CONFIG_PCI set.
 */
 
-#ifndef __i386__
 #undef CONFIG_SCSI_OMIT_FLASHPOINT
 #define CONFIG_SCSI_OMIT_FLASHPOINT
-#endif
 
 #ifndef CONFIG_PCI
 #undef CONFIG_SCSI_OMIT_FLASHPOINT

diff -ru ./linux-2.6.9-orig/drivers/scsi/dpt_i2o.c ./linux-2.6.9/drivers/scsi/dpt_i2o.c
@@ -83,9 +83,7 @@
  */
 static dpt_sig_S DPTI_sig = {
 	{'d', 'P', 't', 'S', 'i', 'G'}, SIG_VERSION,
-#ifdef __i386__
-	PROC_INTEL, PROC_386 | PROC_486 | PROC_PENTIUM | PROC_SEXIUM,
-#elif defined(__ia64__)
+#if defined(__ia64__)
 	PROC_INTEL, PROC_IA64,
 #elif defined(__sparc__)
 	PROC_ULTRASPARC, PROC_ULTRASPARC,

@@ -1831,9 +1829,7 @@
 	si.busType = SI_PCI_BUS;
 	si.processorFamily = DPTI_sig.dsProcessorFamily;
 
-#if defined __i386__ 
-	adpt_i386_info(&si);
-#elif defined (__ia64__)
+#if defined (__ia64__)
 	adpt_ia64_info(&si);
 #elif defined(__sparc__)
 	adpt_sparc_info(&si);

@@ -1881,32 +1877,6 @@
 }
 #endif
 
-#if defined __i386__
-
-static void adpt_i386_info(sysInfo_S* si)
-{
-	// This is all the info we need for now
-	// We will add more info as our new
-	// managmenent utility requires it
-	switch (boot_cpu_data.x86) {
-	case CPU_386:
-		si->processorType = PROC_386;
-		break;
-	case CPU_486:
-		si->processorType = PROC_486;
-		break;
-	case CPU_586:
-		si->processorType = PROC_PENTIUM;
-		break;
-	default:  // Just in case 
-		si->processorType = PROC_PENTIUM;
-		break;
-	}
-}
-
-#endif
-
-
 static int adpt_ioctl(struct inode *inode, struct file *file, uint cmd,
 	      ulong arg)
 {

diff -ru ./linux-2.6.9-orig/drivers/scsi/dpti.h ./linux-2.6.9/drivers/scsi/dpti.h
@@ -334,9 +334,6 @@
 #if defined __alpha__ 
 static void adpt_sparc_info(sysInfo_S* si);
 #endif
-#if defined __i386__
-static void adpt_i386_info(sysInfo_S* si);
-#endif
 
 #define PRINT_BUFFER_SIZE     512