Commit 7b16a155 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

habanalabs: fix up absolute include instructions 



There's no need to try to be cute with the include file locations in the
Makefile, so just specify exactly where the files are.

Bonus is this fixes the problem of building with O= as well as trying to
just build the subdirectory alone.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Oded Gabbay <oded.gabbay@gmail.com>
Cc: Omer Shpigelman <oshpigelman@habana.ai>
Cc: Tomer Tayar <ttayar@habana.ai>
Cc: Moti Haimovski <mhaimovski@habana.ai>
Cc: Ofir Bitton <obitton@habana.ai>
Cc: Ben Segal <bpsegal20@gmail.com>
Cc: Christine Gharzuzi <cgharzuzi@habana.ai>
Cc: Pawel Piskorski <ppiskorski@habana.ai>
Link: https://lore.kernel.org/r/20200728171851.55842-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 65a9bde6

drivers/misc/habanalabs/common/Makefile

+0 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

subdir-ccflags-y += -I$(src)/common



HL_COMMON_FILES := common/habanalabs_drv.o common/device.o common/context.o \

		common/asid.o common/habanalabs_ioctl.o \

		common/command_buffer.o common/hw_queue.o common/irq.o \

drivers/misc/habanalabs/common/debugfs.c

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



#include "habanalabs.h"

#include "include/hw_ip/mmu/mmu_general.h"

#include "../include/hw_ip/mmu/mmu_general.h"



#include <linux/pci.h>

#include <linux/debugfs.h>

drivers/misc/habanalabs/common/firmware_if.c

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



#include "habanalabs.h"

#include "include/common/hl_boot_if.h"

#include "../include/common/hl_boot_if.h"



#include <linux/firmware.h>

#include <linux/genalloc.h>

drivers/misc/habanalabs/common/habanalabs.h

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
#ifndef HABANALABSP_H_

#define HABANALABSP_H_



#include "include/common/armcp_if.h"

#include "include/common/qman_if.h"

#include "../include/common/armcp_if.h"

#include "../include/common/qman_if.h"

#include <uapi/misc/habanalabs.h>



#include <linux/cdev.h>

drivers/misc/habanalabs/common/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#include <uapi/misc/habanalabs.h>

#include "habanalabs.h"

#include "include/hw_ip/mmu/mmu_general.h"

#include "../include/hw_ip/mmu/mmu_general.h"



#include <linux/uaccess.h>

#include <linux/slab.h>