[PATCH] kill blk_nohighio boot parameter

It was useful in 2.4 to debug the blockhighmem stuff but in 2.5
it's b0rked because doesn't have any implication except propagation
of the highmem_io flags from the scsi host template to the scsi
host structure.  It also only worked on i386.

ACKed by Jens.

arch/i386/kernel/setup.c

@@ -96,7 +96,6 @@ extern void dmi_scan_machine(void);
 extern void generic_apic_probe(char *);
 extern int root_mountflags;
 extern char _text, _etext, _edata, _end;
-extern int blk_nohighio;
 
 unsigned long saved_videomode;
 
@@ -992,15 +991,6 @@ void __init setup_arch(char **cmdline_p)
 #endif
 }
 
-static int __init highio_setup(char *str)
-{
-	printk("i386: disabling HIGHMEM block I/O\n");
-	blk_nohighio = 1;
-	return 1;
-}
-__setup("nohighio", highio_setup);
- 
-
 #include "setup_arch_post.h"
 /*
  * Local Variables:

drivers/block/ll_rw_blk.c

@@ -49,8 +49,6 @@ static spinlock_t blk_plug_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
 static int queue_nr_requests;
 
 unsigned long blk_max_low_pfn, blk_max_pfn;
-int blk_nohighio = 0;
-
 static wait_queue_head_t congestion_wqh[2];
 
 /*
@@ -2334,7 +2332,6 @@ EXPORT_SYMBOL(blk_queue_hardsect_size);
 EXPORT_SYMBOL(blk_queue_segment_boundary);
 EXPORT_SYMBOL(blk_queue_dma_alignment);
 EXPORT_SYMBOL(blk_rq_map_sg);
-EXPORT_SYMBOL(blk_nohighio);
 EXPORT_SYMBOL(blk_dump_rq_flags);
 EXPORT_SYMBOL(submit_bio);
 EXPORT_SYMBOL(blk_phys_contig_segment);

drivers/scsi/hosts.c

@@ -125,7 +125,6 @@ void scsi_free_shost(struct Scsi_Host *shost)
  **/
 struct Scsi_Host *scsi_host_alloc(Scsi_Host_Template *sht, int privsize)
 {
-	extern int blk_nohighio;
 	struct Scsi_Host *shost;
 	int gfp_mask = GFP_KERNEL, rval;
 	DECLARE_COMPLETION(complete);
@@ -186,8 +185,7 @@ struct Scsi_Host *scsi_host_alloc(Scsi_Host_Template *sht, int privsize)
 	shost->unchecked_isa_dma = sht->unchecked_isa_dma;
 	shost->use_clustering = sht->use_clustering;
 	shost->use_blk_tcq = sht->use_blk_tcq;
-	if (!blk_nohighio)
-		shost->highmem_io = sht->highmem_io;
+	shost->highmem_io = sht->highmem_io;
 
 	if (!sht->max_host_blocked)
 		shost->max_host_blocked = sht->max_host_blocked;