Please pull git390 'for-linus' branch
Subsystems (5)
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
Documentation/DocBook/s390-drivers.tmpl | 21 +- arch/s390/Kconfig | 8 + arch/s390/Kconfig.debug | 8 + arch/s390/kernel/entry.S | 7 +- arch/s390/kernel/entry64.S | 7 +- arch/s390/kernel/ipl.c | 27 +- arch/s390/kernel/setup.c | 14 +- arch/s390/kernel/smp.c | 13 +- arch/s390/kernel/stacktrace.c | 31 ++- arch/s390/kernel/traps.c | 5 +- arch/s390/kernel/vmlinux.lds.S | 2 +- arch/s390/mm/init.c | 27 ++ arch/s390/mm/vmem.c | 5 +- drivers/s390/block/dasd.c | 19 +- drivers/s390/block/dasd_3990_erp.c | 62 +++- drivers/s390/block/dcssblk.c | 5 +- drivers/s390/char/sclp_tty.c | 2 +- drivers/s390/char/sclp_vt220.c | 2 +- drivers/s390/cio/ccwgroup.c | 12 + drivers/s390/cio/chsc.c | 147 +++----- drivers/s390/cio/device_id.c | 107 ++++--- include/asm-s390/bitops.h | 558 ++++++++++++++---------------- include/asm-s390/cacheflush.h | 4 + include/asm-s390/ccwgroup.h | 2 + include/asm-s390/pgtable.h | 12 +- 25 files changed, 587 insertions(+), 520 deletions(-)
Christian Borntraeger (1):
[S390] sclp_tty/sclp_vt220: Fix scheduling while atomic
Cornelia Huck (3):
[S390] cio: Clean up chsc response code handling. [S390] cio: Update documentation.
[S390] cio: Add shutdown callback for ccwgroup.
Heiko Carstens (8):
[S390] DEBUG_PAGEALLOC support for s390. [S390] Fix linker script.
[S390] Fix smp_call_function_mask semantics. [S390] Fix couple of section mismatches. [S390] Implement ext2_find_next_bit. [S390] latencytop s390 support.
[S390] Remove BUILD_BUG_ON() in vmem code. [S390] dcss: Initialize workqueue before using it.
Martin Schwidefsky (2):
[S390] Define GENERIC_LOCKBREAK.
[S390] Cleanup & optimize bitops.
Peter Oberparleiter (2):
[S390] cio: make sense id procedure work with partial hardware response [S390] console: allow vt220 console to be the only console
Stefan Haberland (1):
[S390] dasd: add ifcc handling
Stefan Weinhuber (1):
[S390] dasd: fix panic caused by alias device offline
Documentation/DocBook/s390-drivers.tmpl +16 -5
@@ -59,7 +59,7 @@ <title>Introduction</title> <para> This document describes the interfaces available for device drivers that - drive s390 based channel attached devices. This includes interfaces for + drive s390 based channel attached I/O devices. This includes interfaces for interaction with the hardware and interfaces for interacting with the common driver core. Those interfaces are provided by the s390 common I/O layer.
@@ -86,9 +86,10 @@ The ccw bus typically contains the majority of devices available to a s390 system. Named after the channel command word (ccw), the basic command structure used to address its devices, the ccw bus contains - so-called channel attached devices. They are addressed via subchannels, - visible on the css bus. A device driver, however, will never interact - with the subchannel directly, but only via the device on the ccw bus, + so-called channel attached devices. They are addressed via I/O + subchannels, visible on the css bus. A device driver for + channel-attached devices, however, will never interact with the + subchannel directly, but only via the I/O device on the ccw bus, the ccw device. </para> <sect1 id="channelIO">
@@ -116,7 +117,6 @@ !Iinclude/asm-s390/ccwdev.h !Edrivers/s390/cio/device.c !Edrivers/s390/cio/device_ops.c -!Edrivers/s390/cio/airq.c </sect1> <sect1 id="cmf"> <title>The channel-measurement facility</title>
@@ -147,4 +147,15 @@ </sect1> </chapter> + <chapter id="genericinterfaces"> + <title>Generic interfaces</title> + <para> + Some interfaces are available to other drivers that do not necessarily + have anything to do with the busses described above, but still are + indirectly using basic infrastructure in the common I/O layer. + One example is the support for adapter interrupts. + </para> +!Edrivers/s390/cio/airq.c + </chapter> + </book>
arch/s390/Kconfig +8 -0
@@ -16,6 +16,9 @@ config LOCKDEP_SUPPORT config STACKTRACE_SUPPORT def_bool y +config HAVE_LATENCYTOP_SUPPORT + def_bool y + config RWSEM_GENERIC_SPINLOCK bool
@@ -47,6 +50,11 @@ config NO_IOMEM config NO_DMA def_bool y +config GENERIC_LOCKBREAK + bool + default y + depends on SMP && PREEMPT + mainmenu "Linux Kernel Configuration" config S390
arch/s390/Kconfig.debug +8 -0
@@ -6,4 +6,12 @@ config TRACE_IRQFLAGS_SUPPORT source "lib/Kconfig.debug" +config DEBUG_PAGEALLOC + bool "Debug page memory allocations" + depends on DEBUG_KERNEL + help + Unmap pages from the kernel linear mapping after free_pages(). + This results in a slowdown, but helps to find certain types of + memory corruptions. + endmenu
arch/s390/kernel/entry.S +2 -5
@@ -11,6 +11,7 @@ #include <linux/sys.h> #include <linux/linkage.h> +#include <linux/init.h> #include <asm/cache.h> #include <asm/lowcore.h> #include <asm/errno.h>
@@ -830,9 +831,7 @@ mcck_return: * Restart interruption handler, kick starter for additional CPUs */ #ifdef CONFIG_SMP -#ifndef CONFIG_HOTPLUG_CPU - .section .init.text,"ax" -#endif + __CPUINIT .globl restart_int_handler restart_int_handler: l %r15,__LC_SAVE_AREA+60 # load ksp
@@ -845,9 +844,7 @@ restart_int_handler: br %r14 # branch to start_secondary restart_addr: .long start_secondary -#ifndef CONFIG_HOTPLUG_CPU .previous -#endif #else /* * If we do not run with SMP enabled, let the new CPU crash ...
arch/s390/kernel/entry64.S +2 -5
@@ -11,6 +11,7 @@ #include <linux/sys.h> #include <linux/linkage.h> +#include <linux/init.h> #include <asm/cache.h> #include <asm/lowcore.h> #include <asm/errno.h>
@@ -801,9 +802,7 @@ mcck_return: * Restart interruption handler, kick starter for additional CPUs */ #ifdef CONFIG_SMP -#ifndef CONFIG_HOTPLUG_CPU - .section .init.text,"ax" -#endif + __CPUINIT .globl restart_int_handler restart_int_handler: lg %r15,__LC_SAVE_AREA+120 # load ksp
@@ -814,9 +813,7 @@ restart_int_handler: lmg %r6,%r15,__SF_GPRS(%r15) # load registers from clone stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on jg start_secondary -#ifndef CONFIG_HOTPLUG_CPU .previous -#endif #else /* * If we do not run with SMP enabled, let the new CPU crash ...
arch/s390/kernel/ipl.c +18 -9
@@ -439,7 +439,7 @@ static void ipl_run(struct shutdown_trigger *trigger)reipl_ccw_dev (&ipl_info.data.ccw.dev_id); } -static int ipl_init (void ) +static int __init ipl_init (void ) {int rc;
@@ -471,8 +471,11 @@ out:return 0 ; } -static struct shutdown_action ipl_action = {SHUTDOWN_ACTION_IPL_STR , ipl_run, - ipl_init}; +static struct shutdown_action __refdata ipl_action = { + .name =SHUTDOWN_ACTION_IPL_STR , + .fn = ipl_run, + .init = ipl_init, +};/* * reipl shutdown action: Reboot Linux on shutdown.
@@ -792,7 +795,7 @@ static int __init reipl_fcp_init(void)return 0 ; } -static int reipl_init (void ) +static int __init reipl_init (void ) {int rc;
@@ -819,8 +822,11 @@ static int reipl_init(void)return 0 ; } -static struct shutdown_action reipl_action = {SHUTDOWN_ACTION_REIPL_STR , - reipl_run, reipl_init}; +static struct shutdown_action __refdata reipl_action = { + .name =SHUTDOWN_ACTION_REIPL_STR , + .fn = reipl_run, + .init = reipl_init, +};/* * dump shutdown action: Dump Linux on shutdown.
@@ -998,7 +1004,7 @@ static int __init dump_fcp_init(void)return 0 ; } -static int dump_init (void ) +static int __init dump_init (void ) {int rc;
@@ -1020,8 +1026,11 @@ static int dump_init(void)return 0 ; } -static struct shutdown_action dump_action = {SHUTDOWN_ACTION_DUMP_STR , - dump_run, dump_init}; +static struct shutdown_action __refdata dump_action = { + .name =SHUTDOWN_ACTION_DUMP_STR , + .fn = dump_run, + .init = dump_init, +};/* * vmcmd shutdown action: Trigger vm command on shutdown.
arch/s390/kernel/setup.c +7 -7
@@ -77,7 +77,7 @@ unsigned long machine_flags = 0;unsigned long elf_hwcap =0 ;char elf_platform[ELF_PLATFORM_SIZE ]; -struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS ]; +struct mem_chunk __meminitdata memory_chunk[MEMORY_CHUNKS ];volatile int __cpu_logical_map[NR_CPUS ];/* logical cpu to cpu address */ static unsigned long __initdata memory_end;
@@ -145,7 +145,7 @@ __setup("condev=", condev_setup);static int __init conmode_setup (char *str) { -#if defined(CONFIG_SCLP_CONSOLE ) +#if defined(CONFIG_SCLP_CONSOLE ) || defined(CONFIG_SCLP_VT220_CONSOLE )if (strncmp (str,"hwc" ,4 ) ==0 ||strncmp (str,"sclp" ,5 ) ==0 )SET_CONSOLE_SCLP ;#endif
@@ -183,7 +183,7 @@ static void __init conmode_default(void)*/ cpcmd ("TERM CONMODE 3215" ,NULL ,0 ,NULL );if (ptr ==NULL ) { -#if defined(CONFIG_SCLP_CONSOLE ) +#if defined(CONFIG_SCLP_CONSOLE ) || defined(CONFIG_SCLP_VT220_CONSOLE )SET_CONSOLE_SCLP ;#endif return ;
@@ -193,7 +193,7 @@ static void __init conmode_default(void)SET_CONSOLE_3270 ;#elif defined(CONFIG_TN3215_CONSOLE )SET_CONSOLE_3215 ; -#elif defined(CONFIG_SCLP_CONSOLE ) +#elif defined(CONFIG_SCLP_CONSOLE ) || defined(CONFIG_SCLP_VT220_CONSOLE )SET_CONSOLE_SCLP ;#endif }else if (strncmp (ptr +8 ,"3215" ,4 ) ==0 ) {
@@ -201,7 +201,7 @@ static void __init conmode_default(void)SET_CONSOLE_3215 ;#elif defined(CONFIG_TN3270_CONSOLE )SET_CONSOLE_3270 ; -#elif defined(CONFIG_SCLP_CONSOLE ) +#elif defined(CONFIG_SCLP_CONSOLE ) || defined(CONFIG_SCLP_VT220_CONSOLE )SET_CONSOLE_SCLP ;#endif }
@@ -212,7 +212,7 @@ static void __init conmode_default(void)SET_CONSOLE_3270 ;#endif }else { -#if defined(CONFIG_SCLP_CONSOLE ) +#if defined(CONFIG_SCLP_CONSOLE ) || defined(CONFIG_SCLP_VT220_CONSOLE )SET_CONSOLE_SCLP ;#endif }
@@ -528,7 +528,7 @@ static void __init setup_memory_end(void) memory_size =0 ; memory_end &=PAGE_MASK ; - max_mem = memory_end ?min (VMALLOC_START , memory_end) :VMALLOC_START ; + max_mem = memory_end ?min (VMEM_MAX_PHYS , memory_end) :VMEM_MAX_PHYS ; memory_end =min (max_mem, memory_end);/*
arch/s390/kernel/smp.c +6 -7
@@ -225,12 +225,11 @@ EXPORT_SYMBOL(smp_call_function_single);* You must not call this function with disabled interrupts or from a * hardware interrupt handler or from a bottom half handler. */ -int -smp_call_function_mask (cpumask_t mask, -void (*func)(void *),void *info, -int wait) +int smp_call_function_mask (cpumask_t mask,void (*func)(void *),void *info, +int wait) {preempt_disable (); +cpu_clear (smp_processor_id (), mask);__smp_call_function_map (func, info,0 , wait, mask);preempt_enable ();return 0 ;
@@ -1008,7 +1007,7 @@ static struct notifier_block __cpuinitdata smp_cpu_nb = { .notifier_call = smp_cpu_notify, }; -static int smp_add_present_cpu (int cpu) +static int __devinit smp_add_present_cpu (int cpu) {struct cpu *c = &per_cpu (cpu_devices, cpu);struct sys_device *s = &c->sysdev;
@@ -1036,8 +1035,8 @@ out: }#ifdef CONFIG_HOTPLUG_CPU -static ssize_t rescan_store (struct sys_device *dev,const char *buf, -size_t count) +static ssize_t __ref rescan_store (struct sys_device *dev, +const char *buf,size_t count) {cpumask_t newcpus;int cpu;
arch/s390/kernel/stacktrace.c +23 -8
@@ -14,7 +14,8 @@static unsigned long save_context_stack (struct stack_trace *trace,unsigned long sp,unsigned long low, -unsigned long high) +unsigned long high, +int savesched) {struct stack_frame *sf;struct pt_regs *regs;
@@ -47,10 +48,12 @@ static unsigned long save_context_stack(struct stack_trace *trace,return sp; regs = (struct pt_regs *)sp; addr = regs->psw.addr &PSW_ADDR_INSN ; -if (!trace->skip) - trace->entries[trace->nr_entries++] = addr; -else - trace->skip--; +if (savesched || !in_sched_functions (addr)) { +if (!trace->skip) + trace->entries[trace->nr_entries++] = addr; +else + trace->skip--; + }if (trace->nr_entries >= trace->max_entries)return sp; low = sp;
@@ -66,15 +69,27 @@ void save_stack_trace(struct stack_trace *trace) orig_sp = sp &PSW_ADDR_INSN ; new_sp =save_context_stack (trace, orig_sp, S390_lowcore.panic_stack -PAGE_SIZE , - S390_lowcore.panic_stack); + S390_lowcore.panic_stack,1 );if (new_sp != orig_sp)return ; new_sp =save_context_stack (trace, new_sp, S390_lowcore.async_stack -ASYNC_SIZE , - S390_lowcore.async_stack); + S390_lowcore.async_stack,1 );if (new_sp != orig_sp)return ;save_context_stack (trace, new_sp, S390_lowcore.thread_info, - S390_lowcore.thread_info +THREAD_SIZE ); + S390_lowcore.thread_info +THREAD_SIZE ,1 ); +} + +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +unsigned long sp, low, high; + + sp = tsk->thread.ksp &PSW_ADDR_INSN ; + low = (unsigned long )task_stack_page (tsk); + high = (unsigned long )task_pt_regs (tsk); +save_context_stack (trace, sp, low, high,0 ); +if (trace->nr_entries < trace->max_entries) + trace->entries[trace->nr_entries++] =ULONG_MAX ; }
arch/s390/kernel/traps.c +4 -1
@@ -271,7 +271,10 @@ void die(const char * str, struct pt_regs * regs, long err)printk ("PREEMPT " );#endif #ifdef CONFIG_SMP -printk ("SMP" ); +printk ("SMP " ); +#endif +#ifdef CONFIG_DEBUG_PAGEALLOC +printk ("DEBUG_PAGEALLOC" );#endif printk ("\n" );notify_die (DIE_OOPS , str, regs, err, current->thread.trap_no,SIGSEGV );
arch/s390/kernel/vmlinux.lds.S +1 -1
@@ -35,7 +35,7 @@ SECTIONS KPROBES_TEXT *(.fixup) *(.gnu.warning) - } = 0x0700 + } :text = 0x0700 _etext = .; /* End of text section */
arch/s390/mm/init.c +27 -0
@@ -167,6 +167,33 @@ void __init mem_init(void) PFN_ALIGN((unsigned long)&_eshared) - 1); } +#ifdef CONFIG_DEBUG_PAGEALLOC +void kernel_map_pages (struct page *page,int numpages,int enable) +{ +pgd_t *pgd; +pud_t *pud; +pmd_t *pmd; +pte_t *pte; +unsigned long address; +int i; + +for (i =0 ; i < numpages; i++) { + address =page_to_phys (page + i); + pgd =pgd_offset_k (address); + pud =pud_offset (pgd, address); + pmd =pmd_offset (pud, address); + pte =pte_offset_kernel (pmd, address); +if (!enable) { +ptep_invalidate (address, pte); +continue ; + } + *pte =mk_pte_phys (address,__pgprot (_PAGE_TYPE_RW)); +/* Flush cpu write queue. */ +mb (); + } +} +#endif +void free_initmem (void ) {unsigned long addr;
arch/s390/mm/vmem.c +2 -3
@@ -62,7 +62,7 @@ void __meminit memmap_init(unsigned long size, int nid, unsigned long zone, } } -static void __init_refok *vmem_alloc_pages(unsigned int order) +static void __ref *vmem_alloc_pages (unsigned int order) {if (slab_is_available ())return (void *)__get_free_pages (GFP_KERNEL , order);
@@ -250,7 +250,7 @@ static int insert_memory_segment(struct memory_segment *seg) {struct memory_segment *tmp; -if (seg->start + seg->size >=VMALLOC_START || +if (seg->start + seg->size >=VMEM_MAX_PHYS || seg->start + seg->size < seg->start)return -ERANGE ;
@@ -360,7 +360,6 @@ void __init vmem_map_init(void) {int i; -BUILD_BUG_ON ((unsigned long )VMEM_MAP +VMEM_MAP_SIZE >VMEM_MAP_MAX );NODE_DATA (0 )->node_mem_map =VMEM_MAP ;for (i =0 ; i <MEMORY_CHUNKS && memory_chunk[i].size >0 ; i++)vmem_add_mem (memory_chunk[i].addr, memory_chunk[i].size);
drivers/s390/block/dasd.c +7 -12
@@ -1057,12 +1057,11 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,if (device->features &DASD_FEATURE_ERPLOG ) {dasd_log_sense (cqr, irb); } -/* If we have no sense data, or we just don't want complex ERP -* for this request, but if we have retries left, then just -* reset this request and retry it in the fastpath +/* +* If we don't want complex ERP for this request, then just +* reset this and retry it in the fastpath */ -if (!(cqr->irb.esw.esw0.erw.cons && -test_bit (DASD_CQR_FLAGS_USE_ERP , &cqr->flags)) && +if (!test_bit (DASD_CQR_FLAGS_USE_ERP , &cqr->flags) && cqr->retries >0 ) { DEV_MESSAGE(KERN_DEBUG, device, "default ERP in fastpath (%i retries left)",
@@ -1707,7 +1706,7 @@ static void __dasd_cleanup_cqr(struct dasd_ccw_req *cqr) req = (struct request *) cqr->callback_data;dasd_profile_end (cqr->block, cqr, req); - status = cqr->memdev->discipline->free_cp (cqr, req); + status = cqr->block->base->discipline->free_cp (cqr, req);if (status <=0 ) error = status ? status : -EIO ;dasd_end_request (req, error);
@@ -1742,12 +1741,8 @@ restart:/* Process requests that may be recovered */ if (cqr->status ==DASD_CQR_NEED_ERP ) { -if (cqr->irb.esw.esw0.erw.cons && -test_bit (DASD_CQR_FLAGS_USE_ERP , - &cqr->flags)) { - erp_fn = base->discipline->erp_action (cqr); -erp_fn (cqr); - } + erp_fn = base->discipline->erp_action (cqr); +erp_fn (cqr); goto restart; }
drivers/s390/block/dasd_3990_erp.c +46 -16
105 lines not on this page · raw message
drivers/s390/block/dcssblk.c +2 -3
@@ -415,6 +415,8 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char dev_info->gd->queue = dev_info->dcssblk_queue; dev_info->gd->private_data = dev_info; dev_info->gd->driverfs_dev = &dev_info->dev; +blk_queue_make_request (dev_info->dcssblk_queue, dcssblk_make_request); +blk_queue_hardsect_size (dev_info->dcssblk_queue,4096 );/* * load the segment */
@@ -472,9 +474,6 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const charif (rc) goto unregister_dev; -blk_queue_make_request (dev_info->dcssblk_queue, dcssblk_make_request); -blk_queue_hardsect_size (dev_info->dcssblk_queue,4096 ); -add_disk (dev_info->gd);switch (dev_info->segment_type) {
drivers/s390/char/sclp_tty.c +1 -1
@@ -332,7 +332,7 @@ sclp_tty_write_string(const unsigned char *str, int count)if (sclp_ttybuf ==NULL ) {while (list_empty (&sclp_tty_pages)) {spin_unlock_irqrestore (&sclp_tty_lock, flags); -if (in_interrupt ()) +if (in_atomic ())sclp_sync_wait ();else wait_event(sclp_tty_waitq,
drivers/s390/char/sclp_vt220.c +1 -1
@@ -400,7 +400,7 @@ __sclp_vt220_write(const unsigned char *buf, int count, int do_schedule,while (list_empty (&sclp_vt220_empty)) {spin_unlock_irqrestore (&sclp_vt220_lock, flags); -if (in_interrupt ()) +if (in_atomic ())sclp_sync_wait ();else wait_event(sclp_vt220_waitq,
drivers/s390/cio/ccwgroup.c +12 -0
@@ -391,12 +391,24 @@ ccwgroup_remove (struct device *dev)return 0 ; } +static void ccwgroup_shutdown (struct device *dev) +{ +struct ccwgroup_device *gdev; +struct ccwgroup_driver *gdrv; + + gdev =to_ccwgroupdev (dev); + gdrv =to_ccwgroupdrv (dev->driver); +if (gdrv && gdrv->shutdown) + gdrv->shutdown (gdev); +} +static struct bus_type ccwgroup_bus_type = { .name ="ccwgroup" , .match = ccwgroup_bus_match, .uevent = ccwgroup_uevent, .probe = ccwgroup_probe, .remove = ccwgroup_remove, + .shutdown = ccwgroup_shutdown, };/**
drivers/s390/cio/chsc.c +55 -92
219 lines not on this page · raw message
drivers/s390/cio/device_id.c +64 -43
168 lines not on this page · raw message
include/asm-s390/bitops.h +260 -298
676 lines not on this page · raw message
include/asm-s390/cacheflush.h +4 -0
@@ -24,4 +24,8 @@#define copy_from_user_page (vma, page, vaddr, dst, src, len) \ memcpy(dst, src, len) +#ifdef CONFIG_DEBUG_PAGEALLOC +void kernel_map_pages (struct page *page,int numpages,int enable); +#endif +#endif /* _S390_CACHEFLUSH_H */
include/asm-s390/ccwgroup.h +2 -0
@@ -37,6 +37,7 @@ struct ccwgroup_device {* @remove: function called on remove * @set_online: function called when device is set online * @set_offline: function called when device is set offline +* @shutdown: function called when device is shut down * @driver: embedded driver structure */ struct ccwgroup_driver {
@@ -49,6 +50,7 @@ struct ccwgroup_driver {void (*remove) (struct ccwgroup_device *);int (*set_online) (struct ccwgroup_device *);int (*set_offline) (struct ccwgroup_device *); +void (*shutdown)(struct ccwgroup_device *);struct device_driver driver; };
include/asm-s390/pgtable.h +9 -3
@@ -115,15 +115,21 @@ extern char empty_zero_page[PAGE_SIZE];#ifndef __s390x__#define VMALLOC_START 0x78000000UL#define VMALLOC_END 0x7e000000UL -#define VMEM_MAP_MAX 0x80000000UL +#define VMEM_MAP_END 0x80000000UL#else /* __s390x__ */ #define VMALLOC_START 0x3e000000000UL#define VMALLOC_END 0x3e040000000UL -#define VMEM_MAP_MAX 0x40000000000UL +#define VMEM_MAP_END 0x40000000000UL#endif /* __s390x__ */ +/* +* VMEM_MAX_PHYS is the highest physical address that can be added to the 1:1 +* mapping. This needs to be calculated at compile time since the size of the +* VMEM_MAP is static but the size of struct page can change. +*/ +#define VMEM_MAX_PHYS min(VMALLOC_START, ((VMEM_MAP_END - VMALLOC_END) / \ + sizeof(struct page) * PAGE_SIZE) & ~((16 << 20) - 1))#define VMEM_MAP ((struct page *) VMALLOC_END) -#define VMEM_MAP_SIZE ((VMALLOC_START / PAGE_SIZE) * sizeof(struct page))/* * A 31 bit pagetable entry of S390 has following format: