Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (a97a2d4d) · Commits · 戴 / test

arch/sparc/include/asm/parport.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		*/
		#define HAS_DMA

		#ifdef CONFIG_PARPORT_PC_FIFO
		static DEFINE_SPINLOCK(dma_spin_lock);

		#define claim_dma_lock() \
		@@ -31,6 +32,7 @@ static DEFINE_SPINLOCK(dma_spin_lock);

		#define release_dma_lock(__flags) \
		spin_unlock_irqrestore(&dma_spin_lock, __flags);
		#endif

		static struct sparc_ebus_info {
		struct ebus_dma_info info;

arch/sparc/include/asm/thread_info_64.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -121,8 +121,12 @@ struct thread_info {
		}

		/* how to get the thread information struct from C */
		#ifndef BUILD_VDSO
		register struct thread_info *current_thread_info_reg asm("g6");
		#define current_thread_info() (current_thread_info_reg)
		#else
		extern struct thread_info *current_thread_info(void);
		#endif

		/* thread information allocation */
		#if PAGE_SHIFT == 13

arch/sparc/include/asm/vdso.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -8,10 +8,10 @@
		struct vdso_image {
		void *data;
		unsigned long size; /* Always a multiple of PAGE_SIZE */

		unsigned long tick_patch, tick_patch_len;

		long sym_vvar_start; /* Negative offset to the vvar area */
		long sym_vread_tick; /* Start of vread_tick section */
		long sym_vread_tick_patch_start; /* Start of tick read */
		long sym_vread_tick_patch_end; /* End of tick read */
		};

		#ifdef CONFIG_SPARC64

arch/sparc/kernel/time_64.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -53,8 +53,6 @@

		DEFINE_SPINLOCK(rtc_lock);

		unsigned int __read_mostly vdso_fix_stick;

		#ifdef CONFIG_SMP
		unsigned long profile_pc(struct pt_regs *regs)
		{
		@@ -838,7 +836,6 @@ void __init time_init_early(void)
		} else {
		init_tick_ops(&tick_operations);
		clocksource_tick.archdata.vclock_mode = VCLOCK_TICK;
		vdso_fix_stick = 1;
		}
		} else {
		init_tick_ops(&stick_operations);

arch/sparc/vdso/Makefile

+17 −16

Original line number	Diff line number	Diff line
		@@ -33,10 +33,8 @@ targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)

		CPPFLAGS_vdso.lds += -P -C

		VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
		-Wl,--no-undefined \
		-Wl,-z,max-page-size=8192 -Wl,-z,common-page-size=8192 \
		$(DISABLE_LTO)
		VDSO_LDFLAGS_vdso.lds = -m elf64_sparc -soname linux-vdso.so.1 --no-undefined \
		-z max-page-size=8192 -z common-page-size=8192

		$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
		$(call if_changed,vdso)
		@@ -54,13 +52,14 @@ $(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE
		# Don't omit frame pointers for ease of userspace debugging, but do
		# optimize sibling calls.
		#
		CFL := $(PROFILING) -mcmodel=medlow -fPIC -O2 -fasynchronous-unwind-tables \
		-m64 -ffixed-g2 -ffixed-g3 -fcall-used-g4 -fcall-used-g5 -ffixed-g6 \
		-ffixed-g7 $(filter -g%,$(KBUILD_CFLAGS)) \
		$(call cc-option, -fno-stack-protector) -fno-omit-frame-pointer \
		-foptimize-sibling-calls -DBUILD_VDSO
		CFL := $(PROFILING) -mcmodel=medlow -fPIC -O2 -fasynchronous-unwind-tables -m64 \
		$(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector) \
		-fno-omit-frame-pointer -foptimize-sibling-calls \
		-DDISABLE_BRANCH_PROFILING -DBUILD_VDSO

		$(vobjs): KBUILD_CFLAGS += $(CFL)
		SPARC_REG_CFLAGS = -ffixed-g4 -ffixed-g5 -fcall-used-g5 -fcall-used-g7

		$(vobjs): KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS) $(SPARC_REG_CFLAGS),$(KBUILD_CFLAGS)) $(CFL)

		#
		# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
		@@ -73,7 +72,7 @@ $(obj)/%.so: $(obj)/%.so.dbg
		$(call if_changed,objcopy)

		CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
		VDSO_LDFLAGS_vdso32.lds = -m32 -Wl,-m,elf32_sparc,-soname=linux-gate.so.1
		VDSO_LDFLAGS_vdso32.lds = -m elf32_sparc -soname linux-gate.so.1

		#This makes sure the $(obj) subdirectory exists even though vdso32/
		#is not a kbuild sub-make subdirectory
		@@ -91,7 +90,8 @@ KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS))
		KBUILD_CFLAGS_32 := $(filter-out -mcmodel=medlow,$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out -fno-pic,$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 += -m32 -msoft-float -fpic -mno-app-regs -ffixed-g7
		KBUILD_CFLAGS_32 := $(filter-out $(SPARC_REG_CFLAGS),$(KBUILD_CFLAGS_32))
		KBUILD_CFLAGS_32 += -m32 -msoft-float -fpic
		KBUILD_CFLAGS_32 += $(call cc-option, -fno-stack-protector)
		KBUILD_CFLAGS_32 += $(call cc-option, -foptimize-sibling-calls)
		KBUILD_CFLAGS_32 += -fno-omit-frame-pointer
		@@ -109,12 +109,13 @@ $(obj)/vdso32.so.dbg: FORCE \
		# The DSO images are built using a special linker script.
		#
		quiet_cmd_vdso = VDSO $@
		cmd_vdso = $(CC) -nostdlib -o $@ \
		cmd_vdso = $(LD) -nostdlib -o $@ \
		$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
		-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
		-T $(filter %.lds,$^) $(filter %.o,$^) && \
		sh $(srctree)/$(src)/checkundef.sh '$(OBJDUMP)' '$@'

		VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
		$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic
		VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
		$(call ld-option, --build-id) -Bsymbolic
		GCOV_PROFILE := n

		#

Admin message