diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-06-06 05:26:29 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-06-06 05:26:29 +0000 |
| commit | a1f47ae1b3ab3d6d9e811d100317d0a970c5a5e4 (patch) | |
| tree | 1b8ffe71b941f528b451979c9d3464592c4cc556 /sys/arch/amd64 | |
| parent | af1fe0a1c6d54e4177e0f0294d68760b077bd998 (diff) | |
instead of #ifndef SMALL_KERNELing the whole sg_dma.c file, just put the
information in files.conf like it should be.
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/sg_dma.c | 10 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/files.amd64 | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/sys/arch/amd64/amd64/sg_dma.c b/sys/arch/amd64/amd64/sg_dma.c index 95642705f8b..a32a32cea64 100644 --- a/sys/arch/amd64/amd64/sg_dma.c +++ b/sys/arch/amd64/amd64/sg_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sg_dma.c,v 1.2 2009/05/04 16:48:37 oga Exp $ */ +/* $OpenBSD: sg_dma.c,v 1.3 2009/06/06 05:26:28 oga Exp $ */ /* * Copyright (c) 2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -64,8 +64,6 @@ #define MAX_DMA_SEGS 20 #endif -#ifndef SMALL_KERNEL /* no bigmem needed in ramdisks */ - /* * per-map DVMA page table */ @@ -512,7 +510,8 @@ sg_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map, if ((boundary = segs[0]._ds_boundary) == 0) boundary = map->_dm_boundary; - align = MAX(segs[0]._ds_align, PAGE_SIZE); + align = MAX(MAX(segs[0]._ds_align, map->dm_segs[0]._ds_align), + PAGE_SIZE); /* * Make sure that on error condition we return "no valid mappings". @@ -956,6 +955,3 @@ sg_iomap_clear_pages(struct sg_page_map *spm) spm->spm_pagecnt = 0; SPLAY_INIT(&spm->spm_tree); } - - -#endif /* !SMALL_KERNEL */ diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index f772602558c..846425dadb2 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.51 2009/06/06 03:20:57 deraadt Exp $ +# $OpenBSD: files.amd64,v 1.52 2009/06/06 05:26:28 oga Exp $ maxpartitions 16 maxusers 2 16 128 @@ -29,7 +29,7 @@ file arch/amd64/amd64/lock_machdep.c multiprocessor file arch/amd64/amd64/intr.c file arch/amd64/amd64/bus_space.c file arch/amd64/amd64/bus_dma.c -file arch/amd64/amd64/sg_dma.c +file arch/amd64/amd64/sg_dma.c !small_kernel file arch/amd64/amd64/mptramp.S multiprocessor file arch/amd64/amd64/ipifuncs.c multiprocessor |