Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e001b36 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: reap unused kernel files"

parents b8a2a10e f06163e6

arch/arm/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -269,20 +269,6 @@ config GENERIC_BUG 
	def_bool y

	depends on BUG



config GENERIC_TIME_VSYSCALL

	bool "Enable gettimeofday updates"

	depends on CPU_V7

	help

	  Enables updating the kernel user helper area with the xtime struct

	  data for gettimeofday via kernel user helpers.



config ARM_USE_USER_ACCESSIBLE_TIMERS

	bool "Enables mapping a timer counter page to user space"

	depends on USE_USER_ACCESSIBLE_TIMERS && GENERIC_TIME_VSYSCALL

	help

	 Enables ARM-specific user-accessible timers via a shared

	 memory page containing the cycle counter.



config ARM_USER_ACCESSIBLE_TIMER_BASE

	hex "Base address of user-accessible timer counter page"

	default 0xfffef000

arch/arm/include/asm/archrandom.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#ifndef ARM_ASM_ARCHRANDOM_H

#define ARM_ASM_ARCHRANDOM_H



extern int arch_get_random_long(unsigned long *v);

extern int arch_get_random_int(unsigned int *v);



#endif

arch/arm/include/asm/user_accessible_timer.h

+1 −14
Original line number Diff line number Diff line 
/* Copyright (c) 2012, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,18 +17,6 @@ 


extern unsigned long zero_pfn;



#ifdef CONFIG_ARM_USE_USER_ACCESSIBLE_TIMERS

#ifndef CONFIG_ARM_USER_ACCESSIBLE_TIMER_BASE

#define CONFIG_ARM_USER_ACCESSIBLE_TIMER_BASE 0xfffef000

#endif

extern void setup_user_timer_offset(unsigned long addr);

extern int get_timer_page_address(void);

static inline int get_user_accessible_timers_base(void)

{

	return CONFIG_ARM_USER_ACCESSIBLE_TIMER_BASE;

}

extern void set_user_accessible_timer_flag(bool flag);

#else

#define CONFIG_ARM_USER_ACCESSIBLE_TIMER_BASE 0

static inline void setup_user_timer_offset(unsigned long addr)

{
@@ -44,6 +32,5 @@ static inline int get_user_accessible_timers_base(void) 
static inline void set_user_accessible_timer_flag(bool flag)

{

}

#endif



#endif

arch/arm/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 
obj-$(CONFIG_SWP_EMULATE)	+= swp_emulate.o

CFLAGS_swp_emulate.o		:= -Wa,-march=armv7-a

obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o

obj-$(CONFIG_GENERIC_TIME_VSYSCALL)	+= update_vsyscall_arm.o



obj-$(CONFIG_CPU_XSCALE)	+= xscale-cp0.o

obj-$(CONFIG_CPU_XSC3)		+= xscale-cp0.o
@@ -73,7 +72,6 @@ obj-$(CONFIG_IWMMXT) += iwmmxt.o 
obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o perf_event_cpu.o

AFLAGS_iwmmxt.o			:= -Wa,-mcpu=iwmmxt

obj-$(CONFIG_ARM_CPU_TOPOLOGY)  += topology.o

obj-$(CONFIG_ARM_USE_USER_ACCESSIBLE_TIMERS)	+= user_accessible_timer.o



ifneq ($(CONFIG_ARCH_EBSA110),y)

  obj-y		+= io.o

arch/arm/kernel/perf_event_msm.c

deleted100644 → 0
+0 −756

File deleted.

Preview size limit exceeded, changes collapsed.