Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze (91302873) · Commits · e / devices / android_kernel_xiaomi_sm6125

arch/microblaze/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -90,7 +90,7 @@ source "arch/microblaze/platform/Kconfig.platform"

	menu "Processor type and features"		menu "Processor type and features"

	source kernel/time/Kconfig		source "kernel/time/Kconfig"

	source "kernel/Kconfig.preempt"		source "kernel/Kconfig.preempt"

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,7 @@ struct pt_regs {
	int pt_mode;		int pt_mode;
	};		};

			#ifdef __KERNEL__
	#define kernel_mode(regs) ((regs)->pt_mode)		#define kernel_mode(regs) ((regs)->pt_mode)
	#define user_mode(regs) (!kernel_mode(regs))		#define user_mode(regs) (!kernel_mode(regs))

	@@ -62,6 +63,19 @@ struct pt_regs {

	void show_regs(struct pt_regs *);		void show_regs(struct pt_regs *);

			#else /* __KERNEL__ */

			/* pt_regs offsets used by gdbserver etc in ptrace syscalls */
			#define PT_GPR(n) ((n) * sizeof(microblaze_reg_t))
			#define PT_PC (32 * sizeof(microblaze_reg_t))
			#define PT_MSR (33 * sizeof(microblaze_reg_t))
			#define PT_EAR (34 * sizeof(microblaze_reg_t))
			#define PT_ESR (35 * sizeof(microblaze_reg_t))
			#define PT_FSR (36 * sizeof(microblaze_reg_t))
			#define PT_KERNEL_MODE (37 * sizeof(microblaze_reg_t))

			#endif /* __KERNEL */

	#endif /* __ASSEMBLY__ */		#endif /* __ASSEMBLY__ */

	#endif /* _ASM_MICROBLAZE_PTRACE_H */		#endif /* _ASM_MICROBLAZE_PTRACE_H */

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -377,13 +377,14 @@
	#define __NR_shutdown 359 /* new */		#define __NR_shutdown 359 /* new */
	#define __NR_sendmsg 360 /* new */		#define __NR_sendmsg 360 /* new */
	#define __NR_recvmsg 361 /* new */		#define __NR_recvmsg 361 /* new */
	#define __NR_accept04 362 /* new */		#define __NR_accept4 362 /* new */
	#define __NR_preadv 363 /* new */		#define __NR_preadv 363 /* new */
	#define __NR_pwritev 364 /* new */		#define __NR_pwritev 364 /* new */
	#define __NR_rt_tgsigqueueinfo 365 /* new */		#define __NR_rt_tgsigqueueinfo 365 /* new */
	#define __NR_perf_event_open 366 /* new */		#define __NR_perf_event_open 366 /* new */
			#define __NR_recvmmsg 367 /* new */

	#define __NR_syscalls 367		#define __NR_syscalls 368

	#ifdef __KERNEL__		#ifdef __KERNEL__
	#ifndef __ASSEMBLY__		#ifndef __ASSEMBLY__

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -256,7 +256,7 @@ int of_irq_map_pci(struct pci_dev pdev, struct of_irq out_irq)
	if (ppdev == NULL) {		if (ppdev == NULL) {
	struct pci_controller *host;		struct pci_controller *host;
	host = pci_bus_to_host(pdev->bus);		host = pci_bus_to_host(pdev->bus);
	ppnode = host ? host->arch_data : NULL;		ppnode = host ? host->dn : NULL;
	/* No node for host bridge ? give up */		/* No node for host bridge ? give up */
	if (ppnode == NULL)		if (ppnode == NULL)
	return -EINVAL;		return -EINVAL;

+1 −1