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

Commit 47916be4 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'powerpc.cherry-picks' into timers/clocksource 



Conflicts:
	arch/powerpc/kernel/time.c

Reason: The powerpc next tree contains two commits which conflict with
the timekeeping changes:

8fd63a9e powerpc: Rework VDSO gettimeofday to prevent time going backwards
c1aa687d powerpc: Clean up obsolete code relating to decrementer and timebase

John Stultz identified them and provided the conflict resolution.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 852db46d d75d68cf

arch/powerpc/include/asm/machdep.h

+0 −3
Original line number Diff line number Diff line
@@ -366,8 +366,5 @@ static inline void log_error(char *buf, unsigned int err_type, int fatal) 
#define machine_late_initcall(mach,fn)		__define_machine_initcall(mach,"7",fn,7)

#define machine_late_initcall_sync(mach,fn)	__define_machine_initcall(mach,"7s",fn,7s)



void generic_suspend_disable_irqs(void);

void generic_suspend_enable_irqs(void);



#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_MACHDEP_H */

arch/powerpc/include/asm/time.h

+0 −7
Original line number Diff line number Diff line
@@ -28,16 +28,12 @@ 
extern unsigned long tb_ticks_per_jiffy;

extern unsigned long tb_ticks_per_usec;

extern unsigned long tb_ticks_per_sec;

extern u64 tb_to_xs;

extern unsigned      tb_to_us;



struct rtc_time;

extern void to_tm(int tim, struct rtc_time * tm);

extern void GregorianDay(struct rtc_time *tm);

extern time_t last_rtc_update;



extern void generic_calibrate_decr(void);

extern void wakeup_decrementer(void);

extern void snapshot_timebase(void);



extern void set_dec_cpu6(unsigned int val);
@@ -204,9 +200,6 @@ static inline unsigned long tb_ticks_since(unsigned long tstamp) 
extern u64 mulhdu(u64, u64);

#endif



extern void smp_space_timers(unsigned int);



extern unsigned mulhwu_scale_factor(unsigned, unsigned);

extern void div128_by_32(u64 dividend_high, u64 dividend_low,

			 unsigned divisor, struct div_result *dr);

arch/powerpc/include/asm/vdso_datapage.h

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ struct vdso_data { 
	__s32 wtom_clock_sec;			/* Wall to monotonic clock */

	__s32 wtom_clock_nsec;

	struct timespec stamp_xtime;	/* xtime as at tb_orig_stamp */

	__u32 stamp_sec_fraction;	/* fractional seconds of stamp_xtime */

   	__u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls  */

   	__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */

};
@@ -105,6 +106,7 @@ struct vdso_data { 
	__s32 wtom_clock_sec;			/* Wall to monotonic clock */

	__s32 wtom_clock_nsec;

	struct timespec stamp_xtime;	/* xtime as at tb_orig_stamp */

	__u32 stamp_sec_fraction;	/* fractional seconds of stamp_xtime */

   	__u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */

	__u32 dcache_block_size;	/* L1 d-cache block size     */

	__u32 icache_block_size;	/* L1 i-cache block size     */

arch/powerpc/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ int main(void) 
	DEFINE(WTOM_CLOCK_SEC, offsetof(struct vdso_data, wtom_clock_sec));

	DEFINE(WTOM_CLOCK_NSEC, offsetof(struct vdso_data, wtom_clock_nsec));

	DEFINE(STAMP_XTIME, offsetof(struct vdso_data, stamp_xtime));

	DEFINE(STAMP_SEC_FRAC, offsetof(struct vdso_data, stamp_sec_fraction));

	DEFINE(CFG_ICACHE_BLOCKSZ, offsetof(struct vdso_data, icache_block_size));

	DEFINE(CFG_DCACHE_BLOCKSZ, offsetof(struct vdso_data, dcache_block_size));

	DEFINE(CFG_ICACHE_LOGBLOCKSZ, offsetof(struct vdso_data, icache_log_block_size));

arch/powerpc/kernel/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -289,8 +289,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	else

		max_cpus = 1;



	smp_space_timers(max_cpus);



	for_each_possible_cpu(cpu)

		if (cpu != boot_cpuid)

			smp_create_idle(cpu);