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

+4 -11
-5
arch/microblaze/mm/init.c
··· 193 { 194 unsigned int kstart, ksize; 195 196 - if (!memblock.reserved.cnt) { 197 - pr_emerg("Error memory count\n"); 198 - machine_restart(NULL); 199 - } 200 - 201 if ((u32) memblock.memory.regions[0].size < 0x400000) { 202 pr_emerg("Memory must be greater than 4MB\n"); 203 machine_restart(NULL);
··· 193 { 194 unsigned int kstart, ksize; 195 196 if ((u32) memblock.memory.regions[0].size < 0x400000) { 197 pr_emerg("Memory must be greater than 4MB\n"); 198 machine_restart(NULL);
+1 -3
arch/mips/kernel/csrc-r4k.c
··· 21 .name = "MIPS", 22 .read = c0_hpt_read, 23 .mask = CLOCKSOURCE_MASK(32), 24 - .flags = CLOCK_SOURCE_IS_CONTINUOUS | 25 - CLOCK_SOURCE_MUST_VERIFY | 26 - CLOCK_SOURCE_VERIFY_PERCPU, 27 }; 28 29 static u64 __maybe_unused notrace r4k_read_sched_clock(void)
··· 21 .name = "MIPS", 22 .read = c0_hpt_read, 23 .mask = CLOCKSOURCE_MASK(32), 24 + .flags = CLOCK_SOURCE_IS_CONTINUOUS, 25 }; 26 27 static u64 __maybe_unused notrace r4k_read_sched_clock(void)
+3 -3
security/apparmor/policy_unpack_test.c
··· 80 *(buf + 1) = strlen(TEST_U32_NAME) + 1; 81 strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3)); 82 *(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32; 83 - *((u32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = TEST_U32_DATA; 84 85 buf = e->start + TEST_NAMED_U64_BUF_OFFSET; 86 *buf = AA_NAME; 87 *(buf + 1) = strlen(TEST_U64_NAME) + 1; 88 strscpy(buf + 3, TEST_U64_NAME, e->end - (void *)(buf + 3)); 89 *(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64; 90 - *((u64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = TEST_U64_DATA; 91 92 buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET; 93 *buf = AA_NAME; ··· 103 *(buf + 1) = strlen(TEST_ARRAY_NAME) + 1; 104 strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3)); 105 *(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY; 106 - *((u16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = TEST_ARRAY_SIZE; 107 108 return e; 109 }
··· 80 *(buf + 1) = strlen(TEST_U32_NAME) + 1; 81 strscpy(buf + 3, TEST_U32_NAME, e->end - (void *)(buf + 3)); 82 *(buf + 3 + strlen(TEST_U32_NAME) + 1) = AA_U32; 83 + *((__le32 *)(buf + 3 + strlen(TEST_U32_NAME) + 2)) = cpu_to_le32(TEST_U32_DATA); 84 85 buf = e->start + TEST_NAMED_U64_BUF_OFFSET; 86 *buf = AA_NAME; 87 *(buf + 1) = strlen(TEST_U64_NAME) + 1; 88 strscpy(buf + 3, TEST_U64_NAME, e->end - (void *)(buf + 3)); 89 *(buf + 3 + strlen(TEST_U64_NAME) + 1) = AA_U64; 90 + *((__le64 *)(buf + 3 + strlen(TEST_U64_NAME) + 2)) = cpu_to_le64(TEST_U64_DATA); 91 92 buf = e->start + TEST_NAMED_BLOB_BUF_OFFSET; 93 *buf = AA_NAME; ··· 103 *(buf + 1) = strlen(TEST_ARRAY_NAME) + 1; 104 strscpy(buf + 3, TEST_ARRAY_NAME, e->end - (void *)(buf + 3)); 105 *(buf + 3 + strlen(TEST_ARRAY_NAME) + 1) = AA_ARRAY; 106 + *((__le16 *)(buf + 3 + strlen(TEST_ARRAY_NAME) + 2)) = cpu_to_le16(TEST_ARRAY_SIZE); 107 108 return e; 109 }