Commit 6cd90e5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull misc fixes from Guenter Roeck.

These are fixes for regressions that Guenther has been reporting, and
the maintainers haven't picked up and sent in. With rc6 fairly imminent,
I'm taking them directly from Guenter.

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  apparmor: fix policy_unpack_test on big endian systems
  Revert "MIPS: csrc-r4k: Apply verification clocksource flags"
  microblaze: don't treat zero reserved memory regions as error
parents 8463be84 98c0cc48

arch/microblaze/mm/init.c

+0 −5
Original line number Diff line number Diff line
@@ -193,11 +193,6 @@ asmlinkage void __init mmu_init(void) 
{

	unsigned int kstart, ksize;



	if (!memblock.reserved.cnt) {

		pr_emerg("Error memory count\n");

		machine_restart(NULL);

	}



	if ((u32) memblock.memory.regions[0].size < 0x400000) {

		pr_emerg("Memory must be greater than 4MB\n");

		machine_restart(NULL);

arch/mips/kernel/csrc-r4k.c

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ static struct clocksource clocksource_mips = { 
	.name		= "MIPS",

	.read		= c0_hpt_read,

	.mask		= CLOCKSOURCE_MASK(32),

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS |

				  CLOCK_SOURCE_MUST_VERIFY |

				  CLOCK_SOURCE_VERIFY_PERCPU,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



static u64 __maybe_unused notrace r4k_read_sched_clock(void)

security/apparmor/policy_unpack_test.c

+3 −3
Original line number Diff line number Diff line
@@ -80,14 +80,14 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, 
	*(buf + 1) = strlen(TEST_U32_NAME) + 1;

	strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3));

	*(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32;

	*((u32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = TEST_U32_DATA;

	*((__le32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = cpu_to_le32(TEST_U32_DATA);



	buf = e->start + TEST_NAMED_U64_BUF_OFFSET;

	*buf = AA_NAME;

	*(buf + 1) = strlen(TEST_U64_NAME) + 1;

	strscpy(buf + 3, TEST_U64_NAME, e->end - (void *)(buf + 3));

	*(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64;

	*((u64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = TEST_U64_DATA;

	*((__le64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = cpu_to_le64(TEST_U64_DATA);



	buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET;

	*buf = AA_NAME;
@@ -103,7 +103,7 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, 
	*(buf + 1) = strlen(TEST_ARRAY_NAME) + 1;

	strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3));

	*(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY;

	*((u16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = TEST_ARRAY_SIZE;

	*((__le16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = cpu_to_le16(TEST_ARRAY_SIZE);



	return e;

}