Commit f7e80117 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

* 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  MAINTAINERS: Update entry for IA64
  [IA64] gpio: GENERIC_GPIO default must be n
  [IA64[ add CONFIG_NET_VENDOR_INTEL=y to default config files where needed
  [IA64] agp/hp-agp: Allow binding user memory to the AGP GART
  [IA64] sn2: add missing put_cpu()
parents 092f4c56 6b1c70b1
...@@ -3205,8 +3205,7 @@ IA64 (Itanium) PLATFORM ...@@ -3205,8 +3205,7 @@ IA64 (Itanium) PLATFORM
M: Tony Luck <tony.luck@intel.com> M: Tony Luck <tony.luck@intel.com>
M: Fenghua Yu <fenghua.yu@intel.com> M: Fenghua Yu <fenghua.yu@intel.com>
L: linux-ia64@vger.kernel.org L: linux-ia64@vger.kernel.org
W: http://www.ia64-linux.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
S: Maintained S: Maintained
F: arch/ia64/ F: arch/ia64/
......
...@@ -92,7 +92,7 @@ config HAVE_SETUP_PER_CPU_AREA ...@@ -92,7 +92,7 @@ config HAVE_SETUP_PER_CPU_AREA
def_bool y def_bool y
config GENERIC_GPIO config GENERIC_GPIO
def_bool y bool
config DMI config DMI
bool bool
......
...@@ -87,6 +87,7 @@ CONFIG_NET_ETHERNET=y ...@@ -87,6 +87,7 @@ CONFIG_NET_ETHERNET=y
CONFIG_NET_TULIP=y CONFIG_NET_TULIP=y
CONFIG_TULIP=m CONFIG_TULIP=m
CONFIG_NET_PCI=y CONFIG_NET_PCI=y
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m CONFIG_E100=m
CONFIG_E1000=y CONFIG_E1000=y
CONFIG_IGB=y CONFIG_IGB=y
......
...@@ -75,6 +75,7 @@ CONFIG_NET_ETHERNET=y ...@@ -75,6 +75,7 @@ CONFIG_NET_ETHERNET=y
CONFIG_NET_TULIP=y CONFIG_NET_TULIP=y
CONFIG_TULIP=m CONFIG_TULIP=m
CONFIG_NET_PCI=y CONFIG_NET_PCI=y
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m CONFIG_E100=m
CONFIG_E1000=y CONFIG_E1000=y
CONFIG_TIGON3=y CONFIG_TIGON3=y
......
...@@ -77,6 +77,7 @@ CONFIG_NET_ETHERNET=y ...@@ -77,6 +77,7 @@ CONFIG_NET_ETHERNET=y
CONFIG_NET_TULIP=y CONFIG_NET_TULIP=y
CONFIG_TULIP=m CONFIG_TULIP=m
CONFIG_NET_PCI=y CONFIG_NET_PCI=y
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m CONFIG_E100=m
CONFIG_E1000=y CONFIG_E1000=y
CONFIG_TIGON3=y CONFIG_TIGON3=y
......
...@@ -80,6 +80,7 @@ CONFIG_NET_ETHERNET=y ...@@ -80,6 +80,7 @@ CONFIG_NET_ETHERNET=y
CONFIG_NET_TULIP=y CONFIG_NET_TULIP=y
CONFIG_TULIP=m CONFIG_TULIP=m
CONFIG_NET_PCI=y CONFIG_NET_PCI=y
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=m CONFIG_E100=m
CONFIG_E1000=y CONFIG_E1000=y
CONFIG_TIGON3=y CONFIG_TIGON3=y
......
...@@ -57,6 +57,7 @@ CONFIG_TULIP_MMIO=y ...@@ -57,6 +57,7 @@ CONFIG_TULIP_MMIO=y
CONFIG_TULIP_NAPI=y CONFIG_TULIP_NAPI=y
CONFIG_TULIP_NAPI_HW_MITIGATION=y CONFIG_TULIP_NAPI_HW_MITIGATION=y
CONFIG_NET_PCI=y CONFIG_NET_PCI=y
CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=y CONFIG_E100=y
CONFIG_E1000=y CONFIG_E1000=y
CONFIG_TIGON3=y CONFIG_TIGON3=y
......
...@@ -615,11 +615,15 @@ static int sn_hwperf_op_cpu(struct sn_hwperf_op_info *op_info) ...@@ -615,11 +615,15 @@ static int sn_hwperf_op_cpu(struct sn_hwperf_op_info *op_info)
} }
} }
if (cpu == SN_HWPERF_ARG_ANY_CPU || cpu == get_cpu()) { if (cpu == SN_HWPERF_ARG_ANY_CPU) {
/* don't care, or already on correct cpu */ /* don't care which cpu */
sn_hwperf_call_sal(op_info); sn_hwperf_call_sal(op_info);
} } else if (cpu == get_cpu()) {
else { /* already on correct cpu */
sn_hwperf_call_sal(op_info);
put_cpu();
} else {
put_cpu();
if (use_ipi) { if (use_ipi) {
/* use an interprocessor interrupt to call SAL */ /* use an interprocessor interrupt to call SAL */
smp_call_function_single(cpu, sn_hwperf_call_sal, smp_call_function_single(cpu, sn_hwperf_call_sal,
......
...@@ -336,7 +336,8 @@ hp_zx1_insert_memory (struct agp_memory *mem, off_t pg_start, int type) ...@@ -336,7 +336,8 @@ hp_zx1_insert_memory (struct agp_memory *mem, off_t pg_start, int type)
off_t j, io_pg_start; off_t j, io_pg_start;
int io_pg_count; int io_pg_count;
if (type != 0 || mem->type != 0) { if (type != mem->type ||
agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) {
return -EINVAL; return -EINVAL;
} }
...@@ -380,7 +381,8 @@ hp_zx1_remove_memory (struct agp_memory *mem, off_t pg_start, int type) ...@@ -380,7 +381,8 @@ hp_zx1_remove_memory (struct agp_memory *mem, off_t pg_start, int type)
struct _hp_private *hp = &hp_private; struct _hp_private *hp = &hp_private;
int i, io_pg_start, io_pg_count; int i, io_pg_start, io_pg_count;
if (type != 0 || mem->type != 0) { if (type != mem->type ||
agp_bridge->driver->agp_type_to_mask_type(agp_bridge, type)) {
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment