Commit 2da56630 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

staging: vchiq: delete vchiq_killable.h 



There are no users for that header file.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff5979ad

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 


#include "vchiq_arm.h"

#include "vchiq_connected.h"

#include "vchiq_killable.h"

#include "vchiq_pagelist.h"



#define MAX_FRAGMENTS (VCHIQ_NUM_CURRENT_BULKS * 2)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#include "vchiq_ioctl.h"

#include "vchiq_arm.h"

#include "vchiq_debugfs.h"

#include "vchiq_killable.h"



#define DEVICE_NAME "vchiq"

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


#include "vchiq_connected.h"

#include "vchiq_core.h"

#include "vchiq_killable.h"

#include <linux/module.h>

#include <linux/mutex.h>

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
 */



#include "vchiq_core.h"

#include "vchiq_killable.h"



#define VCHIQ_SLOT_HANDLER_STACK 8192

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2010-2012 Broadcom. All rights reserved.

 *

 * 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,

 *    without modification.

 * 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.

 * 3. The names of the above-listed copyright holders may not be used

 *    to endorse or promote products derived from this software without

 *    specific prior written permission.

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") version 2, as published by the Free

 * Software Foundation.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.

 */



#ifndef VCHIQ_KILLABLE_H

#define VCHIQ_KILLABLE_H



#include <linux/mutex.h>

#include <linux/semaphore.h>



#define SHUTDOWN_SIGS   (sigmask(SIGKILL) | sigmask(SIGINT) | sigmask(SIGQUIT) | sigmask(SIGTRAP) | sigmask(SIGSTOP) | sigmask(SIGCONT))



static inline int __must_check down_interruptible_killable(struct semaphore *sem)

{

	/* Allow interception of killable signals only. We don't want to be interrupted by harmless signals like SIGALRM */

	int ret;

	sigset_t blocked, oldset;

	siginitsetinv(&blocked, SHUTDOWN_SIGS);

	sigprocmask(SIG_SETMASK, &blocked, &oldset);

	ret = down_interruptible(sem);

	sigprocmask(SIG_SETMASK, &oldset, NULL);

	return ret;

}

#define down_interruptible down_interruptible_killable



#endif