Because of the previous patch breaking the build, this one also had to be removed from the .36 tree.
Care to provide working backports for both of these patches? thanks, greg k-h On Tue, Dec 07, 2010 at 02:04:19PM -0800, [email protected] wrote: > > This is a note to let you know that I've just added the patch titled > > x86: uv: xpc needs to provide an abstraction for uv_gpa > > to the 2.6.32-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > x86-uv-xpc-needs-to-provide-an-abstraction-for-uv_gpa.patch > and it can be found in the queue-2.6.32 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <[email protected]> know about it. > > > >From 682128939f546e3a9cdd9fef392b932dd9c41a65 Mon Sep 17 00:00:00 2001 > From: Robin Holt <[email protected]> > Date: Tue, 15 Dec 2009 16:47:53 -0800 > Subject: x86: uv: xpc needs to provide an abstraction for uv_gpa > > From: Robin Holt <[email protected]> > > commit 682128939f546e3a9cdd9fef392b932dd9c41a65 upstream. > > Provide an SGI SN2/UV agnositic method for converting a global physical > address into a socket physical address. > > Signed-off-by: Robin Holt <[email protected]> > Cc: Jack Steiner <[email protected]> > Cc: Ingo Molnar <[email protected]> > Signed-off-by: Andrew Morton <[email protected]> > Signed-off-by: Linus Torvalds <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > --- > drivers/misc/sgi-xp/xp.h | 1 + > drivers/misc/sgi-xp/xp_main.c | 3 +++ > drivers/misc/sgi-xp/xp_sn2.c | 10 ++++++++++ > drivers/misc/sgi-xp/xp_uv.c | 10 ++++++++++ > 4 files changed, 24 insertions(+) > > --- a/drivers/misc/sgi-xp/xp.h > +++ b/drivers/misc/sgi-xp/xp.h > @@ -339,6 +339,7 @@ extern short xp_partition_id; > extern u8 xp_region_size; > > extern unsigned long (*xp_pa) (void *); > +extern unsigned long (*xp_socket_pa) (unsigned long); > extern enum xp_retval (*xp_remote_memcpy) (unsigned long, const unsigned > long, > size_t); > extern int (*xp_cpu_to_nasid) (int); > --- a/drivers/misc/sgi-xp/xp_main.c > +++ b/drivers/misc/sgi-xp/xp_main.c > @@ -44,6 +44,9 @@ EXPORT_SYMBOL_GPL(xp_region_size); > unsigned long (*xp_pa) (void *addr); > EXPORT_SYMBOL_GPL(xp_pa); > > +unsigned long (*xp_socket_pa) (unsigned long gpa); > +EXPORT_SYMBOL_GPL(xp_socket_pa); > + > enum xp_retval (*xp_remote_memcpy) (unsigned long dst_gpa, > const unsigned long src_gpa, size_t len); > EXPORT_SYMBOL_GPL(xp_remote_memcpy); > --- a/drivers/misc/sgi-xp/xp_sn2.c > +++ b/drivers/misc/sgi-xp/xp_sn2.c > @@ -84,6 +84,15 @@ xp_pa_sn2(void *addr) > } > > /* > + * Convert a global physical to a socket physical address. > + */ > +static unsigned long > +xp_socket_pa_sn2(unsigned long gpa) > +{ > + return gpa; > +} > + > +/* > * Wrapper for bte_copy(). > * > * dst_pa - physical address of the destination of the transfer. > @@ -162,6 +171,7 @@ xp_init_sn2(void) > xp_region_size = sn_region_size; > > xp_pa = xp_pa_sn2; > + xp_socket_pa = xp_socket_pa_sn2; > xp_remote_memcpy = xp_remote_memcpy_sn2; > xp_cpu_to_nasid = xp_cpu_to_nasid_sn2; > xp_expand_memprotect = xp_expand_memprotect_sn2; > --- a/drivers/misc/sgi-xp/xp_uv.c > +++ b/drivers/misc/sgi-xp/xp_uv.c > @@ -32,6 +32,15 @@ xp_pa_uv(void *addr) > return uv_gpa(addr); > } > > +/* > + * Convert a global physical to socket physical address. > + */ > +static unsigned long > +xp_socket_pa_uv(unsigned long gpa) > +{ > + return uv_gpa_to_soc_phys_ram(gpa); > +} > + > static enum xp_retval > xp_remote_mmr_read(unsigned long dst_gpa, const unsigned long src_gpa, > size_t len) > @@ -146,6 +155,7 @@ xp_init_uv(void) > xp_region_size = sn_region_size; > > xp_pa = xp_pa_uv; > + xp_socket_pa = xp_socket_pa_uv; > xp_remote_memcpy = xp_remote_memcpy_uv; > xp_cpu_to_nasid = xp_cpu_to_nasid_uv; > xp_expand_memprotect = xp_expand_memprotect_uv; > > > Patches currently in stable-queue which might be from [email protected] are > > queue-2.6.32/sgi-xpc-xpc-fails-to-discover-partitions-with-all-nasids-above-128.patch > queue-2.6.32/x86-uv-xpc-receive-message-reuse-triggers-invalid-bug_on.patch > queue-2.6.32/uv-xpc-pass-nasid-instead-of-nid-to-gru_create_message_queue.patch > queue-2.6.32/x86-uv-xpc_make_first_contact-hang-due-to-not-accepting-active-state.patch > queue-2.6.32/limit-sysctl_tcp_mem-and-sysctl_udp_mem-initializers-to-prevent-integer-overflows.patch > queue-2.6.32/x86-uv-xpc-null-deref-when-mesq-becomes-empty.patch > queue-2.6.32/x86-uv-update-xpc-to-handle-updated-bios-interface.patch > queue-2.6.32/x86-uv-xpc-needs-to-provide-an-abstraction-for-uv_gpa.patch > > _______________________________________________ > stable mailing list > [email protected] > http://linux.kernel.org/mailman/listinfo/stable _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
