From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- .../drivers/staging/unisys/visorutil/memregion.h | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 kernel/drivers/staging/unisys/visorutil/memregion.h (limited to 'kernel/drivers/staging/unisys/visorutil/memregion.h') diff --git a/kernel/drivers/staging/unisys/visorutil/memregion.h b/kernel/drivers/staging/unisys/visorutil/memregion.h deleted file mode 100644 index 0c3eebcf6..000000000 --- a/kernel/drivers/staging/unisys/visorutil/memregion.h +++ /dev/null @@ -1,43 +0,0 @@ -/* memregion.h - * - * Copyright (C) 2010 - 2013 UNISYS CORPORATION - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or - * NON INFRINGEMENT. See the GNU General Public License for more - * details. - */ - -#ifndef __MEMREGION_H__ -#define __MEMREGION_H__ - -#include "timskmod.h" - -/* struct memregion is an opaque structure to users. - * Fields are declared only in the implementation .c files. - */ -struct memregion; - -struct memregion *visor_memregion_create(HOSTADDRESS physaddr, ulong nbytes); -struct memregion *visor_memregion_create_overlapped(struct memregion *parent, - ulong offset, ulong nbytes); -int visor_memregion_resize(struct memregion *memregion, ulong newsize); -int visor_memregion_read(struct memregion *memregion, - ulong offset, void *dest, ulong nbytes); -int visor_memregion_write(struct memregion *memregion, - ulong offset, void *src, ulong nbytes); -void visor_memregion_destroy(struct memregion *memregion); -HOSTADDRESS visor_memregion_get_physaddr(struct memregion *memregion); -ulong visor_memregion_get_nbytes(struct memregion *memregion); -void memregion_dump(struct memregion *memregion, char *s, - ulong off, ulong len, struct seq_file *seq); -void __iomem *visor_memregion_get_pointer(struct memregion *memregion); - -#endif -- cgit 1.2.3-korg