From 36e3d424b81137f82ce206f72d0dba2807980c28 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Sat, 7 Dec 2024 00:20:23 -0800 Subject: [PATCH] Revert "nvsciipc: Include change for nvsciipc_ioctl.h" This reverts commit ee72e995da1ee31177a06053b4c89f3ba6a1060a. Reason for revert: This breaks building the OOT modules standalone without the GPU sources which are not public. Futhermore, this header appears to be internal and so should not be included in sources that are distributed publicly. Jira: NVIPC-2817 Change-Id: I9a98056b004b7b6454473957f488020718eabfd4 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3263605 Reviewed-by: Brad Griffis GVS: buildbot_gerritrpt --- drivers/misc/nvsciipc/Makefile | 13 +------------ drivers/misc/nvsciipc/nvsciipc.h | 5 ++--- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/misc/nvsciipc/Makefile b/drivers/misc/nvsciipc/Makefile index 094b8ba1..9ce5cf81 100644 --- a/drivers/misc/nvsciipc/Makefile +++ b/drivers/misc/nvsciipc/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -# Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # Makefile for NvSciIpc driver @@ -7,15 +7,4 @@ ccflags-y += -I$(PWD) -ifneq ($(NV_CUSTOMER_BUILD), 1) -ifdef TEGRA_TOP - ccflags-y += -I$(TEGRA_TOP)/gpu/drv/drivers/nvsci/inc/internal -endif -ifdef PWD - ccflags-y += -I$(PWD)/gpu/drv/drivers/nvsci/inc/internal -endif -else -ccflags-y += -I$(TEGRA_TOP)/prebuilt/generic-aaos-pdk/gpu/drv/drivers/nvsci/inc/internal -endif - obj-m += nvsciipc.o diff --git a/drivers/misc/nvsciipc/nvsciipc.h b/drivers/misc/nvsciipc/nvsciipc.h index ebd26cc4..122b8099 100644 --- a/drivers/misc/nvsciipc/nvsciipc.h +++ b/drivers/misc/nvsciipc/nvsciipc.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION & AFFILIATES. - * All rights reserved. + * Copyright (c) 2019-2023, NVIDIA CORPORATION. All rights reserved. */ #ifndef __NVSCIIPC_KERNEL_H__ @@ -9,7 +8,7 @@ #include #include -#include "nvsciipc_ioctl.h" +#include #define ERR(...) pr_err("nvsciipc: " __VA_ARGS__) #define INFO(...) pr_info("nvsciipc: " __VA_ARGS__)