uml: formatting fixes (a5ed1ffa) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/um/kernel/um_arch.c

+25 −26

Original line number	Original line	Diff line number	Diff line
	@@ -63,8 +63,8 @@ struct cpuinfo_um boot_cpu_data = {

	unsigned long thread_saved_pc(struct task_struct *task)		unsigned long thread_saved_pc(struct task_struct *task)
	{		{
	return(os_process_pc(CHOOSE_MODE_PROC(thread_pid_tt, thread_pid_skas,		return os_process_pc(CHOOSE_MODE_PROC(thread_pid_tt, thread_pid_skas,
	task)));		task));
	}		}

	static int show_cpuinfo(struct seq_file m, void v)		static int show_cpuinfo(struct seq_file m, void v)
	@@ -86,7 +86,7 @@ static int show_cpuinfo(struct seq_file m, void v)
	loops_per_jiffy/(500000/HZ),		loops_per_jiffy/(500000/HZ),
	(loops_per_jiffy/(5000/HZ)) % 100);		(loops_per_jiffy/(5000/HZ)) % 100);

	return(0);		return 0;
	}		}

	static void c_start(struct seq_file m, loff_t *pos)		static void c_start(struct seq_file m, loff_t *pos)
	@@ -234,7 +234,7 @@ static int force_tt = 0;
	static int __init mode_tt_setup(char line, int add)		static int __init mode_tt_setup(char line, int add)
	{		{
	force_tt = 1;		force_tt = 1;
	return(0);		return 0;
	}		}

	#else		#else
	@@ -245,7 +245,7 @@ static int __init mode_tt_setup(char line, int add)
	static int __init mode_tt_setup(char line, int add)		static int __init mode_tt_setup(char line, int add)
	{		{
	printf("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");		printf("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
	return(0);		return 0;
	}		}

	#else		#else
	@@ -256,7 +256,7 @@ static int __init mode_tt_setup(char line, int add)
	static int __init mode_tt_setup(char line, int add)		static int __init mode_tt_setup(char line, int add)
	{		{
	printf("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");		printf("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
	return(0);		return 0;
	}		}

	#endif		#endif
	@@ -283,7 +283,6 @@ static int __init Usage(char line, int add)
	p++;		p++;
	}		}
	exit(0);		exit(0);

	return 0;		return 0;
	}		}

	@@ -454,7 +453,7 @@ int __init linux_main(int argc, char **argv)
	task_protections((unsigned long) &init_thread_info);		task_protections((unsigned long) &init_thread_info);
	os_flush_stdout();		os_flush_stdout();

	return(CHOOSE_MODE(start_uml_tt(), start_uml_skas()));		return CHOOSE_MODE(start_uml_tt(), start_uml_skas());
	}		}

	extern int uml_exitcode;		extern int uml_exitcode;
	@@ -467,7 +466,7 @@ static int panic_exit(struct notifier_block *self, unsigned long unused1,
	bust_spinlocks(0);		bust_spinlocks(0);
	uml_exitcode = 1;		uml_exitcode = 1;
	machine_halt();		machine_halt();
	return(0);		return 0;
	}		}

	static struct notifier_block panic_exit_notifier = {		static struct notifier_block panic_exit_notifier = {

arch/um/os-Linux/main.c

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,7 @@ int main(int argc, char argv, char envp)
	ret = 1;		ret = 1;
	}		}
	printf("\n");		printf("\n");
	return(uml_exitcode);		return uml_exitcode;
	}		}

	#define CAN_KMALLOC() \		#define CAN_KMALLOC() \
	@@ -231,7 +231,7 @@ void *__wrap_malloc(int size)
	void *ret;		void *ret;

	if(!CAN_KMALLOC())		if(!CAN_KMALLOC())
	return(__real_malloc(size));		return __real_malloc(size);
	else if(size <= PAGE_SIZE) /* finding contiguos pages can be hard*/		else if(size <= PAGE_SIZE) /* finding contiguos pages can be hard*/
	ret = um_kmalloc(size);		ret = um_kmalloc(size);
	else ret = um_vmalloc(size);		else ret = um_vmalloc(size);
	@@ -242,16 +242,17 @@ void *__wrap_malloc(int size)
	if(ret == NULL)		if(ret == NULL)
	errno = ENOMEM;		errno = ENOMEM;

	return(ret);		return ret;
	}		}

	void *__wrap_calloc(int n, int size)		void *__wrap_calloc(int n, int size)
	{		{
	void ptr = __wrap_malloc(n size);		void ptr = __wrap_malloc(n size);

	if(ptr == NULL) return(NULL);		if(ptr == NULL)
			return NULL;
	memset(ptr, 0, n * size);		memset(ptr, 0, n * size);
	return(ptr);		return ptr;
	}		}

	extern void __real_free(void *);		extern void __real_free(void *);

arch/um/sys-i386/bugs.c

+24 −30

Original line number	Original line	Diff line number	Diff line
	@@ -32,21 +32,21 @@ static char token(int fd, char *buf, int len, char stop)
	n = os_read_file(fd, ptr, sizeof(*ptr));		n = os_read_file(fd, ptr, sizeof(*ptr));
	c = *ptr++;		c = *ptr++;
	if(n != sizeof(*ptr)){		if(n != sizeof(*ptr)){
	if(n == 0) return(0);		if(n == 0)
			return 0;
	printk("Reading /proc/cpuinfo failed, err = %d\n", -n);		printk("Reading /proc/cpuinfo failed, err = %d\n", -n);
	if(n < 0)		if(n < 0)
	return(n);		return n;
	else		else return -EIO;
	return(-EIO);
	}		}
	} while((c != '\n') && (c != stop) && (ptr < end));		} while((c != '\n') && (c != stop) && (ptr < end));

	if(ptr == end){		if(ptr == end){
	printk("Failed to find '%c' in /proc/cpuinfo\n", stop);		printk("Failed to find '%c' in /proc/cpuinfo\n", stop);
	return(-1);		return -1;
	}		}
	*(ptr - 1) = '\0';		*(ptr - 1) = '\0';
	return(c);		return c;
	}		}

	static int find_cpuinfo_line(int fd, char key, char scratch, int len)		static int find_cpuinfo_line(int fd, char key, char scratch, int len)
	@@ -58,25 +58,25 @@ static int find_cpuinfo_line(int fd, char key, char scratch, int len)
	while(1){		while(1){
	c = token(fd, scratch, len - 1, ':');		c = token(fd, scratch, len - 1, ':');
	if(c <= 0)		if(c <= 0)
	return(0);		return 0;
	else if(c != ':'){		else if(c != ':'){
	printk("Failed to find ':' in /proc/cpuinfo\n");		printk("Failed to find ':' in /proc/cpuinfo\n");
	return(0);		return 0;
	}		}

	if(!strncmp(scratch, key, strlen(key)))		if(!strncmp(scratch, key, strlen(key)))
	return(1);		return 1;

	do {		do {
	n = os_read_file(fd, &c, sizeof(c));		n = os_read_file(fd, &c, sizeof(c));
	if(n != sizeof(c)){		if(n != sizeof(c)){
	printk("Failed to find newline in "		printk("Failed to find newline in "
	"/proc/cpuinfo, err = %d\n", -n);		"/proc/cpuinfo, err = %d\n", -n);
	return(0);		return 0;
	}		}
	} while(c != '\n');		} while(c != '\n');
	}		}
	return(0);		return 0;
	}		}

	static int check_cpu_flag(char feature, int have_it)		static int check_cpu_flag(char feature, int have_it)
	@@ -96,7 +96,8 @@ static int check_cpu_flag(char feature, int have_it)
	goto out;		goto out;

	c = token(fd, buf, len - 1, ' ');		c = token(fd, buf, len - 1, ' ');
	if(c < 0) goto out;		if(c < 0)
			goto out;
	else if(c != ' '){		else if(c != ' '){
	printk("Failed to find ' ' in /proc/cpuinfo\n");		printk("Failed to find ' ' in /proc/cpuinfo\n");
	goto out;		goto out;
	@@ -104,7 +105,8 @@ static int check_cpu_flag(char feature, int have_it)

	while(1){		while(1){
	c = token(fd, buf, len - 1, ' ');		c = token(fd, buf, len - 1, ' ');
	if(c < 0) goto out;		if(c < 0)
			goto out;
	else if(c == '\n') break;		else if(c == '\n') break;

	if(!strcmp(buf, feature)){		if(!strcmp(buf, feature)){
	@@ -113,8 +115,10 @@ static int check_cpu_flag(char feature, int have_it)
	}		}
	}		}
	out:		out:
	if(*have_it == 0) printk("No\n");		if(*have_it == 0)
	else if(*have_it == 1) printk("Yes\n");		printk("No\n");
			else if(*have_it == 1)
			printk("Yes\n");
	os_close_file(fd);		os_close_file(fd);
	return 1;		return 1;
	}		}
	@@ -166,12 +170,13 @@ int arch_handle_signal(int sig, union uml_pt_regs *regs)
	/* This is testing for a cmov (0x0f 0x4x) instruction causing a		/* This is testing for a cmov (0x0f 0x4x) instruction causing a
	* SIGILL in init.		* SIGILL in init.
	*/		*/
	if((sig != SIGILL) \|\| (TASK_PID(get_current()) != 1)) return(0);		if((sig != SIGILL) \|\| (TASK_PID(get_current()) != 1))
			return 0;

	if (copy_from_user_proc(tmp, (void *) UPT_IP(regs), 2))		if (copy_from_user_proc(tmp, (void *) UPT_IP(regs), 2))
	panic("SIGILL in init, could not read instructions!\n");		panic("SIGILL in init, could not read instructions!\n");
	if((tmp[0] != 0x0f) \|\| ((tmp[1] & 0xf0) != 0x40))		if((tmp[0] != 0x0f) \|\| ((tmp[1] & 0xf0) != 0x40))
	return(0);		return 0;

	if(host_has_cmov == 0)		if(host_has_cmov == 0)
	panic("SIGILL caused by cmov, which this processor doesn't "		panic("SIGILL caused by cmov, which this processor doesn't "
	@@ -185,16 +190,5 @@ int arch_handle_signal(int sig, union uml_pt_regs *regs)
	"implements it, boot a filesystem compiled for older "		"implements it, boot a filesystem compiled for older "
	"processors");		"processors");
	else panic("Bad value for host_has_cmov (%d)", host_has_cmov);		else panic("Bad value for host_has_cmov (%d)", host_has_cmov);
	return(0);		return 0;
	}		}

	/*
	* Overrides for Emacs so that we follow Linus's tabbing style.
	* Emacs will notice this stuff at the end of the file and automatically
	* adjust the settings for this buffer only. This must remain at the end
	* of the file.
	* ---------------------------------------------------------------------------
	* Local variables:
	* c-file-style: "linux"
	* End:
	*/

arch/um/sys-x86_64/bugs.c

+12 −22

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@ void arch_check_bugs(void)

	int arch_handle_signal(int sig, union uml_pt_regs *regs)		int arch_handle_signal(int sig, union uml_pt_regs *regs)
	{		{
	return(0);		return 0;
	}		}

	#define MAXTOKEN 64		#define MAXTOKEN 64
	@@ -41,21 +41,21 @@ static char token(int fd, char *buf, int len, char stop)
	n = os_read_file(fd, ptr, sizeof(*ptr));		n = os_read_file(fd, ptr, sizeof(*ptr));
	c = *ptr++;		c = *ptr++;
	if(n != sizeof(*ptr)){		if(n != sizeof(*ptr)){
	if(n == 0) return(0);		if(n == 0)
			return 0;
	printk("Reading /proc/cpuinfo failed, err = %d\n", -n);		printk("Reading /proc/cpuinfo failed, err = %d\n", -n);
	if(n < 0)		if(n < 0)
	return(n);		return n;
	else		else return -EIO;
	return(-EIO);
	}		}
	} while((c != '\n') && (c != stop) && (ptr < end));		} while((c != '\n') && (c != stop) && (ptr < end));

	if(ptr == end){		if(ptr == end){
	printk("Failed to find '%c' in /proc/cpuinfo\n", stop);		printk("Failed to find '%c' in /proc/cpuinfo\n", stop);
	return(-1);		return -1;
	}		}
	*(ptr - 1) = '\0';		*(ptr - 1) = '\0';
	return(c);		return c;
	}		}

	static int find_cpuinfo_line(int fd, char key, char scratch, int len)		static int find_cpuinfo_line(int fd, char key, char scratch, int len)
	@@ -67,33 +67,23 @@ static int find_cpuinfo_line(int fd, char key, char scratch, int len)
	while(1){		while(1){
	c = token(fd, scratch, len - 1, ':');		c = token(fd, scratch, len - 1, ':');
	if(c <= 0)		if(c <= 0)
	return(0);		return 0;
	else if(c != ':'){		else if(c != ':'){
	printk("Failed to find ':' in /proc/cpuinfo\n");		printk("Failed to find ':' in /proc/cpuinfo\n");
	return(0);		return 0;
	}		}

	if(!strncmp(scratch, key, strlen(key)))		if(!strncmp(scratch, key, strlen(key)))
	return(1);		return 1;

	do {		do {
	n = os_read_file(fd, &c, sizeof(c));		n = os_read_file(fd, &c, sizeof(c));
	if(n != sizeof(c)){		if(n != sizeof(c)){
	printk("Failed to find newline in "		printk("Failed to find newline in "
	"/proc/cpuinfo, err = %d\n", -n);		"/proc/cpuinfo, err = %d\n", -n);
	return(0);		return 0;
	}		}
	} while(c != '\n');		} while(c != '\n');
	}		}
	return(0);		return 0;
	}		}

	/* Overrides for Emacs so that we follow Linus's tabbing style.
	* Emacs will notice this stuff at the end of the file and automatically
	* adjust the settings for this buffer only. This must remain at the end
	* of the file.
	* ---------------------------------------------------------------------------
	* Local variables:
	* c-file-style: "linux"
	* End:
	*/