Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d02e30c3 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/irq' into x86/apic 



Merge reason:
	Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parents 0fdc7a80 aef55d49

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ modules.builtin 
tags

TAGS

vmlinux

vmlinuz

System.map

Module.markers

Module.symvers

Documentation/ABI/testing/ima_policy

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Description: 
			lsm:	[[subj_user=] [subj_role=] [subj_type=]

				 [obj_user=] [obj_role=] [obj_type=]]



		base: 	func:= [BPRM_CHECK][FILE_MMAP][INODE_PERMISSION]

		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]

			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			fsmagic:= hex value

			uid:= decimal value
@@ -40,11 +40,11 @@ Description: 


			measure func=BPRM_CHECK

			measure func=FILE_MMAP mask=MAY_EXEC

			measure func=INODE_PERM mask=MAY_READ uid=0

			measure func=FILE_CHECK mask=MAY_READ uid=0



		The default policy measures all executables in bprm_check,

		all files mmapped executable in file_mmap, and all files

		open for read by root in inode_permission.

		open for read by root in do_filp_open.



		Examples of LSM specific definitions:
@@ -54,8 +54,8 @@ Description: 


			dont_measure obj_type=var_log_t

			dont_measure obj_type=auditd_log_t

			measure subj_user=system_u func=INODE_PERM mask=MAY_READ

			measure subj_role=system_r func=INODE_PERM mask=MAY_READ

			measure subj_user=system_u func=FILE_CHECK mask=MAY_READ

			measure subj_role=system_r func=FILE_CHECK mask=MAY_READ



		Smack:

			measure subj_user=_ func=INODE_PERM mask=MAY_READ
 
			measure subj_user=_ func=FILE_CHECK mask=MAY_READ

Documentation/DocBook/mtdnand.tmpl

+6 −6
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ 
		</para>

		<programlisting>

static struct mtd_info *board_mtd;

static unsigned long baseaddr;

static void __iomem *baseaddr;

		</programlisting>

		<para>

			Static example
@@ -182,7 +182,7 @@ static unsigned long baseaddr; 
		<programlisting>

static struct mtd_info board_mtd;

static struct nand_chip board_chip;

static unsigned long baseaddr;

static void __iomem *baseaddr;

		</programlisting>

	</sect1>

	<sect1 id="Partition_defines">
@@ -283,7 +283,7 @@ int __init board_init (void) 
	}



	/* map physical address */

	baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);

	baseaddr = ioremap(CHIP_PHYSICAL_ADDRESS, 1024);

	if (!baseaddr) {

		printk("Ioremap to access NAND chip failed\n");

		err = -EIO;
@@ -316,7 +316,7 @@ int __init board_init (void) 
	goto out;



out_ior:

	iounmap((void *)baseaddr);

	iounmap(baseaddr);

out_mtd:

	kfree (board_mtd);

out:
@@ -341,7 +341,7 @@ static void __exit board_cleanup (void) 
	nand_release (board_mtd);



	/* unmap physical address */

	iounmap((void *)baseaddr);

	iounmap(baseaddr);

	

	/* Free the MTD device structure */

	kfree (board_mtd);

Documentation/IO-mapping.txt

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ For such memory, you can do things like 
	 * access only the 640k-1MB area, so anything else

	 * has to be remapped.

	 */

	char * baseptr = ioremap(0xFC000000, 1024*1024);

	void __iomem *baseptr = ioremap(0xFC000000, 1024*1024);



	/* write a 'A' to the offset 10 of the area */

	writeb('A',baseptr+10);