Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (37d9869e) · Commits · 戴 / test

Documentation/s390/CommonIO

+8 −3

Original line number	Diff line number	Diff line
		@@ -70,13 +70,19 @@ Command line parameters

		Note: While already known devices can be added to the list of devices to be
		ignored, there will be no effect on then. However, if such a device
		disappears and then reappears, it will then be ignored.
		disappears and then reappears, it will then be ignored. To make
		known devices go away, you need the "purge" command (see below).

		For example,
		"echo add 0.0.a000-0.0.accc, 0.0.af00-0.0.afff > /proc/cio_ignore"
		will add 0.0.a000-0.0.accc and 0.0.af00-0.0.afff to the list of ignored
		devices.

		You can remove already known but now ignored devices via
		"echo purge > /proc/cio_ignore"
		All devices ignored but still registered and not online (= not in use)
		will be deregistered and thus removed from the system.

		The devices can be specified either by bus id (0.x.abcd) or, for 2.4 backward
		compatibility, by the device number in hexadecimal (0xabcd or abcd). Device
		numbers given as 0xabcd will be interpreted as 0.0.abcd.
		@@ -98,8 +104,7 @@ debugfs entries
		handling).

		- /sys/kernel/debug/s390dbf/cio_msg/sprintf
		Various debug messages from the common I/O-layer, including messages
		printed when cio_msg=yes.
		Various debug messages from the common I/O-layer.

		- /sys/kernel/debug/s390dbf/cio_trace/hex_ascii
		Logs the calling of functions in the common I/O-layer and, if applicable,

arch/s390/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ config S390
		select HAVE_KPROBES
		select HAVE_KRETPROBES
		select HAVE_KVM if 64BIT
		select HAVE_ARCH_TRACEHOOK

		source "init/Kconfig"

arch/s390/include/asm/dasd.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@
		* Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
		* Bugreports.to..: <Linux390@de.ibm.com>
		* (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000
		* EMC Symmetrix ioctl Copyright EMC Corporation, 2008
		* Author.........: Nigel Hislop <hislop_nigel@emc.com>
		*
		* This file is the interface of the DASD device driver, which is exported to user space
		* any future changes wrt the API will result in a change of the APIVERSION reported
		@@ -202,6 +204,16 @@ typedef struct attrib_data_t {
		#define DASD_SEQ_PRESTAGE 0x4
		#define DASD_REC_ACCESS 0x5

		/*
		* Perform EMC Symmetrix I/O
		*/
		typedef struct dasd_symmio_parms {
		unsigned char reserved[8]; /* compat with older releases */
		unsigned long long psf_data; /* char * cast to u64 */
		unsigned long long rssd_result; /* char * cast to u64 */
		int psf_data_len;
		int rssd_result_len;
		} __attribute__ ((packed)) dasd_symmio_parms_t;

		/********************************************************************************
		* SECTION: Definition of IOCTLs
		@@ -247,6 +259,7 @@ typedef struct attrib_data_t {
		/* Set Attributes (cache operations) */
		#define BIODASDSATTR _IOW(DASD_IOCTL_LETTER,2,attrib_data_t)

		#define BIODASDSYMMIO _IOWR(DASD_IOCTL_LETTER, 240, dasd_symmio_parms_t)

		#endif /* DASD_H */

arch/s390/include/asm/delay.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#define _S390_DELAY_H

		extern void __udelay(unsigned long usecs);
		extern void udelay_simple(unsigned long usecs);
		extern void __delay(unsigned long loops);

		#define udelay(n) __udelay(n)

arch/s390/include/asm/pgtable.h

+43 −2

Original line number	Diff line number	Diff line
		@@ -281,6 +281,9 @@ extern char empty_zero_page[PAGE_SIZE];
		#define RCP_GR_BIT 50
		#define RCP_GC_BIT 49

		/* User dirty bit for KVM's migration feature */
		#define KVM_UD_BIT 47

		#ifndef __s390x__

		/* Bits in the segment table address-space-control-element */
		@@ -575,12 +578,16 @@ static inline void ptep_rcp_copy(pte_t *ptep)
		unsigned long pgste = (unsigned long ) (ptep + PTRS_PER_PTE);

		skey = page_get_storage_key(page_to_phys(page));
		if (skey & _PAGE_CHANGED)
		if (skey & _PAGE_CHANGED) {
		set_bit_simple(RCP_GC_BIT, pgste);
		set_bit_simple(KVM_UD_BIT, pgste);
		}
		if (skey & _PAGE_REFERENCED)
		set_bit_simple(RCP_GR_BIT, pgste);
		if (test_and_clear_bit_simple(RCP_HC_BIT, pgste))
		if (test_and_clear_bit_simple(RCP_HC_BIT, pgste)) {
		SetPageDirty(page);
		set_bit_simple(KVM_UD_BIT, pgste);
		}
		if (test_and_clear_bit_simple(RCP_HR_BIT, pgste))
		SetPageReferenced(page);
		#endif
		@@ -744,6 +751,40 @@ static inline pte_t pte_mkspecial(pte_t pte)
		return pte;
		}

		#ifdef CONFIG_PGSTE
		/*
		* Get (and clear) the user dirty bit for a PTE.
		*/
		static inline int kvm_s390_test_and_clear_page_dirty(struct mm_struct *mm,
		pte_t *ptep)
		{
		int dirty;
		unsigned long *pgste;
		struct page *page;
		unsigned int skey;

		if (!mm->context.pgstes)
		return -EINVAL;
		rcp_lock(ptep);
		pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
		page = virt_to_page(pte_val(*ptep));
		skey = page_get_storage_key(page_to_phys(page));
		if (skey & _PAGE_CHANGED) {
		set_bit_simple(RCP_GC_BIT, pgste);
		set_bit_simple(KVM_UD_BIT, pgste);
		}
		if (test_and_clear_bit_simple(RCP_HC_BIT, pgste)) {
		SetPageDirty(page);
		set_bit_simple(KVM_UD_BIT, pgste);
		}
		dirty = test_and_clear_bit_simple(KVM_UD_BIT, pgste);
		if (skey & _PAGE_CHANGED)
		page_clear_dirty(page);
		rcp_unlock(ptep);
		return dirty;
		}
		#endif

		#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
		static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
		unsigned long addr, pte_t *ptep)

Admin message