Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (49bd96c2) · Commits · e / devices / android_kernel_fairphone_FP4

arch/ia64/sn/kernel/bte.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,7 @@ bte_result_t bte_copy(u64 src, u64 dest, u64 len, u64 mode, void *notification)
		bte = bte_if_on_node(nasid_to_try[nasid_index],bte_if_index);

		if (bte == NULL) {
		nasid_index++;
		continue;
		}

arch/ia64/sn/kernel/sn2/sn2_smp.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -492,6 +492,9 @@ static struct proc_dir_entry *proc_sn2_ptc;

		static int __init sn2_ptc_init(void)
		{
		if (!ia64_platform_is("sn2"))
		return -ENOSYS;

		if (!(proc_sn2_ptc = create_proc_entry(PTC_BASENAME, 0444, NULL))) {
		printk(KERN_ERR "unable to create %s proc entry", PTC_BASENAME);
		return -EINVAL;

arch/ia64/sn/kernel/sn2/sn_hwperf.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -743,13 +743,14 @@ sn_hwperf_ioctl(struct inode in, struct file fp, u32 op, u64 arg)
		if ((r = sn_hwperf_enum_objects(&nobj, &objs)) == 0) {
		memset(p, 0, a.sz);
		for (i = 0; i < nobj; i++) {
		int cpuobj_index = 0;
		if (!SN_HWPERF_IS_NODE(objs + i))
		continue;
		node = sn_hwperf_obj_to_cnode(objs + i);
		for_each_online_cpu(j) {
		if (node != cpu_to_node(j))
		continue;
		cpuobj = (struct sn_hwperf_object_info *) p + j;
		cpuobj = (struct sn_hwperf_object_info *) p + cpuobj_index++;
		slice = 'a' + cpuid_to_slice(j);
		cdata = cpu_data(j);
		cpuobj->id = j;

include/asm-ia64/sn/sn_sal.h

+34 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@
		#define SN_SAL_BUS_CONFIG 0x02000037
		#define SN_SAL_SYS_SERIAL_GET 0x02000038
		#define SN_SAL_PARTITION_SERIAL_GET 0x02000039
		#define SN_SAL_SYSCTL_PARTITION_GET 0x0200003a
		#define SN_SAL_SYSTEM_POWER_DOWN 0x0200003b
		#define SN_SAL_GET_MASTER_BASEIO_NASID 0x0200003c
		#define SN_SAL_COHERENCE 0x0200003d
		@@ -580,6 +581,21 @@ sn_partition_serial_number_val(void) {
		return sn_partition_serial_number;
		}

		/*
		* Returns the partition id of the nasid passed in as an argument,
		* or INVALID_PARTID if the partition id cannot be retrieved.
		*/
		static inline partid_t
		ia64_sn_sysctl_partition_get(nasid_t nasid)
		{
		struct ia64_sal_retval ret_stuff;
		SAL_CALL(ret_stuff, SN_SAL_SYSCTL_PARTITION_GET, nasid,
		0, 0, 0, 0, 0, 0);
		if (ret_stuff.status != 0)
		return -1;
		return ((partid_t)ret_stuff.v0);
		}

		/*
		* Returns the physical address of the partition's reserved page through
		* an iterative number of calls.
		@@ -1018,6 +1034,24 @@ ia64_sn_get_sn_info(int fc, u8 shubtype, u16 nasid_bitmask, u8 *nasid_shift,
		ret_stuff.v2 = 0;
		SAL_CALL_NOLOCK(ret_stuff, SN_SAL_GET_SN_INFO, fc, 0, 0, 0, 0, 0, 0);

		/*** BEGIN HACK - temp til old proms no longer supported ******/
		if (ret_stuff.status == SALRET_NOT_IMPLEMENTED) {
		int nasid = get_sapicid() & 0xfff;;
		#define SH_SHUB_ID_NODES_PER_BIT_MASK 0x001f000000000000UL
		#define SH_SHUB_ID_NODES_PER_BIT_SHFT 48
		if (shubtype) *shubtype = 0;
		if (nasid_bitmask) *nasid_bitmask = 0x7ff;
		if (nasid_shift) *nasid_shift = 38;
		if (systemsize) *systemsize = 10;
		if (sharing_domain_size) *sharing_domain_size = 8;
		if (partid) *partid = ia64_sn_sysctl_partition_get(nasid);
		if (coher) *coher = nasid >> 9;
		if (reg) reg = (HUB_L((u64 ) LOCAL_MMR_ADDR(SH1_SHUB_ID)) & SH_SHUB_ID_NODES_PER_BIT_MASK) >>
		SH_SHUB_ID_NODES_PER_BIT_SHFT;
		return 0;
		}
		/*** END HACK *****/

		if (ret_stuff.status < 0)
		return ret_stuff.status;

include/asm-ia64/sn/tioce.h

+7 −19

Original line number	Diff line number	Diff line
		/**************************************************************************
		* *
		* Unpublished copyright (c) 2005, Silicon Graphics, Inc. *
		* THIS IS UNPUBLISHED CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF SGI. *
		* *
		* The copyright notice above does not evidence any actual or intended *
		* publication or disclosure of this source code, which includes *
		* information that is confidential and/or proprietary, and is a trade *
		* secret, of Silicon Graphics, Inc. ANY REPRODUCTION, MODIFICATION, *
		* DISTRIBUTION, PUBLIC PERFORMANCE, OR PUBLIC DISPLAY OF OR THROUGH *
		* USE OF THIS SOURCE CODE WITHOUT THE EXPRESS WRITTEN CONSENT OF *
		* SILICON GRAPHICS, INC. IS STRICTLY PROHIBITED, AND IN VIOLATION OF *
		* APPLICABLE LAWS AND INTERNATIONAL TREATIES. THE RECEIPT OR *
		* POSSESSION OF THIS SOURCE CODE AND/OR RELATED INFORMATION DOES NOT *
		* CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS *
		* CONTENTS, OR TO MANUFACTURE, USE, OR SELL ANYTHING THAT IT MAY *
		* DESCRIBE, IN WHOLE OR IN PART. *
		* *
		**************************************************************************/
		/*
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file "COPYING" in the main directory of this archive
		* for more details.
		*
		* Copyright (c) 2003-2005 Silicon Graphics, Inc. All rights reserved.
		*/

		#ifndef __ASM_IA64_SN_TIOCE_H__
		#define __ASM_IA64_SN_TIOCE_H__