<snip> > static void __init radix_init_partition_table(void) > { > - unsigned long rts_field; > + unsigned long rts_field, ptcr;
I think these functions have changed, check for conflicts against http://git.kernel.org/cgit/linux/kernel/git/paulus/powerpc.git/commit/?h=kvm-ppc-next&id=9d66195807ac6cb8a14231fd055ff755977c5fca > > rts_field = radix__get_tree_size(); > > @@ -193,7 +194,9 @@ static void __init radix_init_partition_table(void) > * update partition table control register, > * 64 K size. > */ <snip> > > +#ifdef CONFIG_PPC_POWERNV > +extern void powernv_set_ptcr(unsigned long ptcr); > +#else > +static inline void powernv_set_ptcr(unisigned long ptcr) { } Michael caught you for this already Balbir