Date: Tue, 20 Nov 2018 23:05:10 +0000 (UTC) From: Ben Widawsky <bwidawsk@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340710 - head/sys/compat/linuxkpi/common/include/linux Message-ID: <201811202305.wAKN5AIA092626@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bwidawsk Date: Tue Nov 20 23:05:09 2018 New Revision: 340710 URL: https://svnweb.freebsd.org/changeset/base/340710 Log: linuxkpi: Remove duplicated text Somehow this got botched while moving from git -> svn Modified: head/sys/compat/linuxkpi/common/include/linux/swap.h Modified: head/sys/compat/linuxkpi/common/include/linux/swap.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/swap.h Tue Nov 20 22:49:19 2018 (r340709) +++ head/sys/compat/linuxkpi/common/include/linux/swap.h Tue Nov 20 23:05:09 2018 (r340710) @@ -49,54 +49,3 @@ current_is_kswapd(void) } #endif -/*- - * Copyright (c) 2018 Intel Corporation - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _LINUX_SWAP_H_ -#define _LINUX_SWAP_H_ - -#include <vm/swap_pager.h> -#include <vm/vm_pageout.h> - -static inline long -get_nr_swap_pages(void) -{ - int i, j; - - /* NB: This could be done cheaply by obtaining swap_total directly */ - swap_pager_status(&i, &j); - return i - j; -} - -static inline int -current_is_kswapd(void) -{ - return vm_curproc_is_vmproc(); -} - -#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811202305.wAKN5AIA092626>