Commit 4796b71f authored by David Howells's avatar David Howells Committed by David Howells
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 



Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
parents 6d5aefb8 ec0bf39a

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -1416,6 +1416,11 @@ and is between 256 and 4096 characters. It is defined in the file 


	scsi_logging=	[SCSI]



	scsi_mod.scan=	[SCSI] sync (default) scans SCSI busses as they are

			discovered.  async scans them in kernel threads,

			allowing boot to proceed.  none ignores them, expecting

			user space to do the scan.



	selinux		[SELINUX] Disable or enable SELinux at boot time.

			Format: { "0" | "1" }

			See security/selinux/Kconfig help text.

Documentation/scsi/scsi_mid_low_api.txt

+5 −26
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ Summary: 
   scsi_add_device - creates new scsi device (lu) instance

   scsi_add_host - perform sysfs registration and set up transport class

   scsi_adjust_queue_depth - change the queue depth on a SCSI device

   scsi_assign_lock - replace default host_lock with given lock

   scsi_bios_ptable - return copy of block device's partition table

   scsi_block_requests - prevent further commands being queued to given host

   scsi_deactivate_tcq - turn off tag command queueing
@@ -488,20 +487,6 @@ void scsi_adjust_queue_depth(struct scsi_device * sdev, int tagged, 
                             int tags)





/**

 * scsi_assign_lock - replace default host_lock with given lock

 * @shost: a pointer to a scsi host instance

 * @lock: pointer to lock to replace host_lock for this host

 *

 *      Returns nothing

 *

 *      Might block: no

 *

 *      Defined in: include/scsi/scsi_host.h .

 **/

void scsi_assign_lock(struct Scsi_Host *shost, spinlock_t *lock)





/**

 * scsi_bios_ptable - return copy of block device's partition table

 * @dev:        pointer to block device
@@ -1366,17 +1351,11 @@ Locks 
Each struct Scsi_Host instance has a spin_lock called struct 

Scsi_Host::default_lock which is initialized in scsi_host_alloc() [found in 

hosts.c]. Within the same function the struct Scsi_Host::host_lock pointer

is initialized to point at default_lock with the scsi_assign_lock() function.

Thereafter lock and unlock operations performed by the mid level use the

struct Scsi_Host::host_lock pointer.



LLDs can override the use of struct Scsi_Host::default_lock by

using scsi_assign_lock(). The earliest opportunity to do this would

be in the detect() function after it has invoked scsi_register(). It

could be replaced by a coarser grain lock (e.g. per driver) or a

lock of equal granularity (i.e. per host). Using finer grain locks 

(e.g. per SCSI device) may be possible by juggling locks in

queuecommand().

is initialized to point at default_lock.  Thereafter lock and unlock

operations performed by the mid level use the struct Scsi_Host::host_lock

pointer.  Previously drivers could override the host_lock pointer but

this is not allowed anymore.





Autosense

=========

block/scsi_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int sg_io(struct file *file, request_queue_t *q, 
	if (rq->bio)

		blk_queue_bounce(q, &rq->bio);



	rq->timeout = (hdr->timeout * HZ) / 1000;

	rq->timeout = jiffies_to_msecs(hdr->timeout);

	if (!rq->timeout)

		rq->timeout = q->sg_timeout;

	if (!rq->timeout)

drivers/ata/pata_pcmcia.c

+5 −10
Original line number Diff line number Diff line
@@ -154,19 +154,12 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
	tuple.TupleOffset = 0;

	tuple.TupleDataMax = 255;

	tuple.Attributes = 0;

	tuple.DesiredTuple = CISTPL_CONFIG;



	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(pdev, &tuple));

	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(pdev, &tuple));

	CS_CHECK(ParseTuple, pcmcia_parse_tuple(pdev, &tuple, &stk->parse));

	pdev->conf.ConfigBase = stk->parse.config.base;

	pdev->conf.Present = stk->parse.config.rmask[0];



	/* See if we have a manufacturer identifier. Use it to set is_kme for

	   vendor quirks */

	tuple.DesiredTuple = CISTPL_MANFID;

	if (!pcmcia_get_first_tuple(pdev, &tuple) && !pcmcia_get_tuple_data(pdev, &tuple) && !pcmcia_parse_tuple(pdev, &tuple, &stk->parse))

			is_kme = ((stk->parse.manfid.manf == MANFID_KME) && ((stk->parse.manfid.card == PRODID_KME_KXLC005_A) || (stk->parse.manfid.card == PRODID_KME_KXLC005_B)));

	is_kme = ((pdev->manf_id == MANFID_KME) &&

		  ((pdev->card_id == PRODID_KME_KXLC005_A) ||

		   (pdev->card_id == PRODID_KME_KXLC005_B)));



	/* Not sure if this is right... look up the current Vcc */

	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(pdev, &stk->conf));
@@ -356,8 +349,10 @@ static struct pcmcia_device_id pcmcia_devices[] = { 
	PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),

	PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),

	PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),

	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),

	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),

	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),

	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),

	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),

drivers/bluetooth/bluecard_cs.c

+1 −37
Original line number Diff line number Diff line
@@ -892,43 +892,10 @@ static void bluecard_detach(struct pcmcia_device *link) 
}





static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)

{

	int i;



	i = pcmcia_get_first_tuple(handle, tuple);

	if (i != CS_SUCCESS)

		return CS_NO_MORE_ITEMS;



	i = pcmcia_get_tuple_data(handle, tuple);

	if (i != CS_SUCCESS)

		return i;



	return pcmcia_parse_tuple(handle, tuple, parse);

}



static int bluecard_config(struct pcmcia_device *link)

{

	bluecard_info_t *info = link->priv;

	tuple_t tuple;

	u_short buf[256];

	cisparse_t parse;

	int i, n, last_ret, last_fn;



	tuple.TupleData = (cisdata_t *)buf;

	tuple.TupleOffset = 0;

	tuple.TupleDataMax = 255;

	tuple.Attributes = 0;



	/* Get configuration register information */

	tuple.DesiredTuple = CISTPL_CONFIG;

	last_ret = first_tuple(link, &tuple, &parse);

	if (last_ret != CS_SUCCESS) {

		last_fn = ParseTuple;

		goto cs_failed;

	}

	link->conf.ConfigBase = parse.config.base;

	link->conf.Present = parse.config.rmask[0];

	int i, n;



	link->conf.ConfigIndex = 0x20;

	link->io.NumPorts1 = 64;
@@ -966,9 +933,6 @@ static int bluecard_config(struct pcmcia_device *link) 


	return 0;



cs_failed:

	cs_error(link, last_fn, last_ret);



failed:

	bluecard_release(link);

	return -ENODEV;