Commit 88032b32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] Poison init section before freeing it.
  [S390] Use add_active_range() and free_area_init_nodes().
  [S390] Virtual memmap for s390.
  [S390] Update documentation for dynamic subchannel mapping.
  [S390] Use dev->groups for adding/removing the subchannel attribute group.
  [S390] Support for disconnected devices reappearing on another subchannel.
  [S390] subchannel lock conversion.
  [S390] Some preparations for the dynamic subchannel mapping patch.
  [S390] runtime switch for qdio performance statistics
  [S390] New DASD feature for ERP related logging
  [S390] add reset call handler to the ap bus.
  [S390] more workqueue fixes.
  [S390] workqueue fixes.
  [S390] uaccess_pt: add missing down_read() and convert to is_init().
parents 63f3861d 028d9b3c

Documentation/s390/driver-model.txt

+7 −0
Original line number Diff line number Diff line
@@ -18,11 +18,18 @@ devices/ 
	   - 0.0.0002/

	   - 0.1.0000/0.1.1234/

	   ...

	   - defunct/



In this example, device 0815 is accessed via subchannel 0 in subchannel set 0,

device 4711 via subchannel 1 in subchannel set 0, and subchannel 2 is a non-I/O

subchannel. Device 1234 is accessed via subchannel 0 in subchannel set 1.



The subchannel named 'defunct' does not represent any real subchannel on the

system; it is a pseudo subchannel where disconnnected ccw devices are moved to

if they are displaced by another ccw device becoming operational on their

former subchannel. The ccw devices will be moved again to a proper subchannel

if they become operational again on that subchannel.



You should address a ccw device via its bus id (e.g. 0.0.4711); the device can

be found under bus/ccw/devices/.

arch/s390/Kconfig

+6 −8
Original line number Diff line number Diff line
@@ -241,8 +241,14 @@ config WARN_STACK_SIZE 
	  This allows you to specify the maximum frame size a function may

	  have without the compiler complaining about it.



config ARCH_POPULATES_NODE_MAP

	def_bool y



source "mm/Kconfig"



config HOLES_IN_ZONE

	def_bool y



comment "I/O subsystem configuration"



config MACHCHK_WARNING
@@ -266,14 +272,6 @@ config QDIO 


	  If unsure, say Y.



config QDIO_PERF_STATS

	bool "Performance statistics in /proc"

	depends on QDIO

	help

	  Say Y here to get performance statistics in /proc/qdio_perf



	  If unsure, say N.



config QDIO_DEBUG

	bool "Extended debugging information"

	depends on QDIO

arch/s390/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ CONFIG_RESOURCES_64BIT=y 
#

CONFIG_MACHCHK_WARNING=y

CONFIG_QDIO=y

# CONFIG_QDIO_PERF_STATS is not set

# CONFIG_QDIO_DEBUG is not set



#

arch/s390/kernel/setup.c

+13 −42
Original line number Diff line number Diff line
@@ -64,9 +64,8 @@ unsigned int console_devno = -1; 
unsigned int console_irq = -1;

unsigned long machine_flags = 0;



struct mem_chunk memory_chunk[MEMORY_CHUNKS];

struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS];

volatile int __cpu_logical_map[NR_CPUS]; /* logical cpu to cpu address */

unsigned long __initdata zholes_size[MAX_NR_ZONES];

static unsigned long __initdata memory_end;



/*
@@ -354,21 +353,6 @@ void machine_power_off(void) 
 */

void (*pm_power_off)(void) = machine_power_off;



static void __init

add_memory_hole(unsigned long start, unsigned long end)

{

	unsigned long dma_pfn = MAX_DMA_ADDRESS >> PAGE_SHIFT;



	if (end <= dma_pfn)

		zholes_size[ZONE_DMA] += end - start + 1;

	else if (start > dma_pfn)

		zholes_size[ZONE_NORMAL] += end - start + 1;

	else {

		zholes_size[ZONE_DMA] += dma_pfn - start + 1;

		zholes_size[ZONE_NORMAL] += end - dma_pfn;

	}

}



static int __init early_parse_mem(char *p)

{

	memory_end = memparse(p, &p);
@@ -521,7 +505,6 @@ setup_memory(void) 
{

        unsigned long bootmap_size;

	unsigned long start_pfn, end_pfn, init_pfn;

	unsigned long last_rw_end;

	int i;



	/*
@@ -577,39 +560,27 @@ setup_memory(void) 
	/*

	 * Register RAM areas with the bootmem allocator.

	 */

	last_rw_end = start_pfn;



	for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {

		unsigned long start_chunk, end_chunk;

		unsigned long start_chunk, end_chunk, pfn;



		if (memory_chunk[i].type != CHUNK_READ_WRITE)

			continue;

		start_chunk = (memory_chunk[i].addr + PAGE_SIZE - 1);

		start_chunk >>= PAGE_SHIFT;

		end_chunk = (memory_chunk[i].addr + memory_chunk[i].size);

		end_chunk >>= PAGE_SHIFT;

		if (start_chunk < start_pfn)

			start_chunk = start_pfn;

		if (end_chunk > end_pfn)

			end_chunk = end_pfn;

		if (start_chunk < end_chunk) {

			/* Initialize storage key for RAM pages */

			for (init_pfn = start_chunk ; init_pfn < end_chunk;

			     init_pfn++)

				page_set_storage_key(init_pfn << PAGE_SHIFT,

						     PAGE_DEFAULT_KEY);

			free_bootmem(start_chunk << PAGE_SHIFT,

				     (end_chunk - start_chunk) << PAGE_SHIFT);

			if (last_rw_end < start_chunk)

				add_memory_hole(last_rw_end, start_chunk - 1);

			last_rw_end = end_chunk;

		}

		start_chunk = PFN_DOWN(memory_chunk[i].addr);

		end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size) - 1;

		end_chunk = min(end_chunk, end_pfn);

		if (start_chunk >= end_chunk)

			continue;

		add_active_range(0, start_chunk, end_chunk);

		pfn = max(start_chunk, start_pfn);

		for (; pfn <= end_chunk; pfn++)

			page_set_storage_key(PFN_PHYS(pfn), PAGE_DEFAULT_KEY);

	}



	psw_set_key(PAGE_DEFAULT_KEY);



	if (last_rw_end < end_pfn - 1)

		add_memory_hole(last_rw_end, end_pfn - 1);

	free_bootmem_with_active_regions(0, max_pfn);

	reserve_bootmem(0, PFN_PHYS(start_pfn));



	/*

	 * Reserve the bootmem bitmap itself as well. We do this in two

arch/s390/lib/uaccess_pt.c

+3 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
 */



#include <linux/errno.h>

#include <asm/uaccess.h>

#include <linux/mm.h>

#include <asm/uaccess.h>

#include <asm/futex.h>



static inline int __handle_fault(struct mm_struct *mm, unsigned long address,
@@ -60,8 +60,9 @@ out: 


out_of_memory:

	up_read(&mm->mmap_sem);

	if (current->pid == 1) {

	if (is_init(current)) {

		yield();

		down_read(&mm->mmap_sem);

		goto survive;

	}

	printk("VM: killing process %s\n", current->comm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE