A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 3.16-rc5 into char-misc-next

Browse source 
This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2014-07-13 15:26:47 -07:00
commit 9f48c89862
1115 changed files with 13897 additions and 8137 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/testing/selftests/ipc/msgque.c
View file

@ -193,6 +193,11 @@ int main(int argc, char **argv)
int msg, pid, err;
struct msgque_data msgque;
if (getuid() != 0) {
printf("Please run the test as root - Exiting.\n");
exit(1);
}
msgque.key = ftok(argv[0], 822155650);
if (msgque.key == -1) {
printf("Can't make key\n");

2
tools/testing/selftests/powerpc/tm/Makefile
View file

@ -2,7 +2,7 @@ PROGS := tm-resched-dscr
all: $(PROGS)
$(PROGS):
$(PROGS): ../harness.c
run_tests: all
@-for PROG in $(PROGS); do \

14
tools/testing/selftests/powerpc/tm/tm-resched-dscr.c
View file

@ -28,6 +28,8 @@
#include <assert.h>
#include <asm/tm.h>
#include "utils.h"
#define TBEGIN ".long 0x7C00051D ;"
#define TEND ".long 0x7C00055D ;"
#define TCHECK ".long 0x7C00059C ;"
@ -36,7 +38,8 @@
#define SPRN_TEXASR 0x82
#define SPRN_DSCR 0x03
int main(void) {
int test_body(void)
{
uint64_t rv, dscr1 = 1, dscr2, texasr;
printf("Check DSCR TM context switch: ");
@ -81,10 +84,15 @@ int main(void) {
}
if (dscr2 != dscr1) {
printf(" FAIL\n");
exit(EXIT_FAILURE);
return 1;
} else {
printf(" OK\n");
exit(EXIT_SUCCESS);
return 0;
}
}
}
int main(void)
{
return test_harness(test_body, "tm_resched_dscr");
}